Merge branch 'TG-carp' into TG-carp-2-electric-boogaloo

This commit is contained in:
hal9000PR
2021-03-31 16:48:48 +01:00
8 changed files with 53 additions and 33 deletions
+1 -1
View File
@@ -853,7 +853,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
Unable to be understood by vampire and changeling agents."
reference = "SCS"
item = /obj/item/sleeping_carp_scroll
cost = 17
cost = 13
excludefrom = list(/datum/game_mode/nuclear)
refundable = TRUE
cant_discount = TRUE