Merge branch 'master' into ship_and_stuff

# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_eyes.dm
This commit is contained in:
alberyk
2022-03-04 14:00:19 -03:00
173 changed files with 1693 additions and 509 deletions
+5
View File
@@ -9,6 +9,11 @@
item_cost = 1
path = /obj/item/storage/box/sinpockets
/datum/uplink_item/item/medical/lunchbox
name = "Syndicate Lunchbox"
item_cost = 1
path = /obj/item/storage/toolbox/lunchbox/syndicate/filled
/datum/uplink_item/item/medical/combathypo
name = "Combat Hypospray"
item_cost = 1