Merge branch 'master' into legion-rework

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -348,6 +348,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
 	null, \
 	new/datum/stack_recipe("improvised gauze", /obj/item/stack/medical/gauze/improvised, 1, 2, 6), \
 	new/datum/stack_recipe("rag", /obj/item/reagent_containers/glass/rag, 1), \
+	new/datum/stack_recipe("towel", /obj/item/towel, 2), \
 	new/datum/stack_recipe("bedsheet", /obj/item/bedsheet, 3), \
 	new/datum/stack_recipe("empty sandbag", /obj/item/emptysandbag, 4), \
 	null, \

code/modules/clothing/outfits/factions/syndicate.dm

@@ -954,6 +954,7 @@
 
 	id = /obj/item/card/id/syndicate_command/crew_id
 	uniform = /obj/item/clothing/under/syndicate/ngr
+	alt_uniform = /obj/item/clothing/under/syndicate/gec
 	accessory = /obj/item/clothing/accessory/armband/engine
 	glasses = /obj/item/clothing/glasses/sunglasses
 	shoes = /obj/item/clothing/shoes/jackboots
@@ -970,6 +971,7 @@
 	name = "Syndicate - Ship Engineer (GEC)"
 
 	uniform = /obj/item/clothing/under/syndicate/gec
+	alt_uniform = null
 	suit = /obj/item/clothing/suit/toggle/hazard
 	head = /obj/item/clothing/head/hardhat
 	id = /obj/item/card/id/syndicate_command/crew_id
@@ -979,13 +981,13 @@
 
 	uniform = /obj/item/clothing/under/syndicate/gorlex
 	shoes = /obj/item/clothing/shoes/workboots
-	alt_uniform = null
 	glasses = null
 
 /datum/outfit/job/syndicate/engineer/twink
 	name = "Syndicate - Ship Engineer (Twinkleshine, GEC)"
 
 	uniform = /obj/item/clothing/under/syndicate/gec
+	alt_uniform = null
 	id = /obj/item/card/id/syndicate_command/crew_id/engi
 	mask = /obj/item/clothing/mask/gas/syndicate/voicechanger
 	ears = null

code/modules/projectiles/ammunition/ballistic/rifle.dm

@@ -7,6 +7,14 @@
 	caliber = "8x50mmR"
 	projectile_type = /obj/projectile/bullet/a8_50r
 
+/obj/item/ammo_casing/a8_50rhp
+	name = "8x50mmR hollow point bullet casing"
+	desc = "A 8x50mmR hollow point bullet casing."
+	icon_state = "rifle-brass-hollow"
+	caliber = "8x50mmR"
+	projectile_type = /obj/projectile/bullet/a8_50rhp
+
+
 // 8x58mm Caseless (SSG-669C)
 
 /obj/item/ammo_casing/caseless/a858

code/modules/projectiles/boxes_magazines/ammo_boxes.dm

@@ -391,3 +391,45 @@
 	custom_materials = list(/datum/material/iron = 15000)
 	w_class = WEIGHT_CLASS_TINY
 	instant_load = TRUE
+
+/obj/item/ammo_box/c46x30mm_box
+	name = "ammo box (4.6x30mm)"
+	desc = "A box of standard 4.6x30mm ammo."
+	icon_state = "4.6x30mmbox"
+	ammo_type = /obj/item/ammo_casing/c46x30mm
+	max_ammo = 50
+
+/obj/item/ammo_box/c8x50mm_box
+	name = "ammo box (8x50mm)"
+	desc = "A box of standard 8x50mm ammo."
+	icon_state = "8x50mm"
+	ammo_type = /obj/item/ammo_casing/a8_50r
+	max_ammo = 50
+
+/obj/item/ammo_box/ferropelletbox
+	name = "ammo box (ferromagnetic pellets)"
+	desc = "A box of ferromagnetic pellets."
+	icon_state = "ferropelletsbox"
+	ammo_type = /obj/item/ammo_casing/caseless/gauss
+	max_ammo = 50
+
+/obj/item/ammo_box/ferroslugbox
+	name = "ammo box (ferromagnetic slugs)"
+	desc = "A box of standard ferromagnetic slugs."
+	icon_state = "ferroslugsbox"
+	ammo_type = /obj/item/ammo_casing/caseless/gauss/slug
+	max_ammo = 20
+
+/obj/item/ammo_box/ferrolancebox
+	name = "ammo box (ferromagnetic lances)"
+	desc = "A box of standard ferromagnetic lances."
+	icon_state = "ferrolancesbox"
+	ammo_type = /obj/item/ammo_casing/caseless/gauss/lance
+	max_ammo = 50
+
+/obj/item/ammo_box/c8x50mmhp_box
+	name = "ammo box (8x50mm)"
+	desc = "A box of hollow point 8x50mm ammo, designed to cause massive damage at the cost of ."
+	icon_state = "8x50mm-hp"
+	ammo_type = /obj/item/ammo_casing/a8_50rhp
+	max_ammo = 20

code/modules/projectiles/projectile/bullets/rifle.dm

@@ -13,6 +13,12 @@
 	damage = 35
 	armour_penetration = 40
 
+/obj/projectile/bullet/a8_50rhp
+	name = "8x50mmR bullet"
+	speed = 0.3
+	damage = 55
+	armour_penetration = 0
+
 // .300 Magnum (Smile Rifle)
 
 /obj/projectile/bullet/a300

html/changelogs/archive/2024-03.yml

@@ -20,3 +20,35 @@
       maps
   thgvr:
   - bugfix: Cryo wakeup message grammar fix
+2024-03-05:
+  Apogee-dev:
+  - balance: Nerfed .38's damage back down to 20
+  MarkSuckerberg:
+  - bugfix: Headpikes actually work again
+  - bugfix: Reinforced floors now don't spawn metal when decompression is experienced
+  Martinpachu:
+  - rscadd: Ammo boxes for 4.6, 8x50, Ferromagnetic slugs, pellets, lances and 8x50
+      Hollow Points!
+  - balance: Granularized ammo boxes in cargo in a similar way to guns.
+  Sadhorizon:
+  - tweak: Alternate jumpsuits for Cybersun, SUNS and NGR engineers/mechanics are
+      now GEC uniforms.
+  Skies-Of-Blue:
+  - bugfix: resolves a typo, making the server less passive when it speaks
+  - tweak: towels can now be crafted using two cloth
+  - tweak: you can now buckle to stools, just as the founding members of the SUNS
+      intended
+  SomeguyManperson:
+  - rscadd: ancient goliaths, crystal fauna (aside from legion), elites and megafauna
+      now have boosted dissection outputs
+  - rscdel: human corpses, podpeople, jellypeople and animal corpses can no longer
+      be dissected. What did you expect to find, an extra pair of lungs?
+  Timberpoes:
+  - bugfix: Papercode has been significantly improved and trivially filled paper forms
+      should no longer lag or crash players' game clients.
+  meemofcourse:
+  - code_imp: ERT antag datums are now sorted into factional files
+  - admin: ERTs can have limited special roles
+  thgvr:
+  - bugfix: Fishing shouldn't fail constantly anymore
+  - bugfix: Fish on the floor will die again