shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits

Browse Source
This commit is contained in:
Putnam3145
2022-05-17 13:22:40 -07:00
parent d5c36b4a99 35f86287e2
commit 33889870c9
1311 changed files with 12771 additions and 10321 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/storage/_storage.dm
+1 -1
View File
@@ -8,7 +8,7 @@
/obj/item/storage/get_dumping_location(obj/item/storage/source,mob/user)
return src
/obj/item/storage/Initialize()
/obj/item/storage/Initialize(mapload)
. = ..()
PopulateContents()
code/game/objects/items/storage/backpack.dm
+3 -3
View File
@@ -44,7 +44,7 @@
item_state = "holdingpack"
resistance_flags = FIRE_PROOF
item_flags = NO_MAT_REDEMPTION
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 50)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 60, ACID = 50)
component_type = /datum/component/storage/concrete/bluespace/bag_of_holding
rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE
@@ -283,7 +283,7 @@
level = 1
component_type = /datum/component/storage/concrete/secret_satchel
/obj/item/storage/backpack/satchel/flat/Initialize()
/obj/item/storage/backpack/satchel/flat/Initialize(mapload)
. = ..()
SSpersistence.new_secret_satchels += src
@@ -316,7 +316,7 @@
var/list/reward_all_of_these = list() //use paths!
var/revealed = FALSE
/obj/item/storage/backpack/satchel/flat/secret/Initialize()
/obj/item/storage/backpack/satchel/flat/secret/Initialize(mapload)
. = ..()
if(isfloorturf(loc) && !isplatingturf(loc))
code/game/objects/items/storage/belt.dm
+2 -2
View File
@@ -28,7 +28,7 @@
for(var/obj/item/I in contents)
. += I.get_worn_belt_overlay(icon_file)
/obj/item/storage/belt/Initialize()
/obj/item/storage/belt/Initialize(mapload)
. = ..()
update_icon()
@@ -366,7 +366,7 @@
/obj/item/storage/belt/military/snack
name = "tactical snack rig"
/obj/item/storage/belt/military/snack/Initialize()
/obj/item/storage/belt/military/snack/Initialize(mapload)
. = ..()
var/sponsor = pick("DonkCo", "Waffle Co.", "Roffle Co.", "Gorlax Marauders", "Tiger Cooperative")
desc = "A set of snack-tical webbing worn by athletes of the [sponsor] VR sports division."
code/game/objects/items/storage/book.dm
+1 -1
View File
@@ -39,7 +39,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible",
var/deity_name = "Christ"
force_string = "holy"
/obj/item/storage/book/bible/Initialize()
/obj/item/storage/book/bible/Initialize(mapload)
. = ..()
AddComponent(/datum/component/anti_magic, FALSE, TRUE)
code/game/objects/items/storage/boxes.dm
+2 -2
View File
@@ -964,7 +964,7 @@
illustration = "fruit"
var/theme_name
/obj/item/storage/box/ingredients/Initialize()
/obj/item/storage/box/ingredients/Initialize(mapload)
. = ..()
if(theme_name)
name = "[name] ([theme_name])"
@@ -1287,7 +1287,7 @@
var/expiration_date_min = 2300
var/expiration_date_max = 2700
/obj/item/storage/box/mre/Initialize()
/obj/item/storage/box/mre/Initialize(mapload)
. = ..()
if(can_expire)
expiration_date = rand(expiration_date_min, expiration_date_max)
code/game/objects/items/storage/firstaid.dm
+11
View File
@@ -405,6 +405,14 @@
for(var/i in 1 to 10)
new /obj/item/reagent_containers/pill/breast_enlargement(src)
/obj/item/storage/pill_bottle/butt_enlargement
name = "butt enlargement pills"
desc = "May alert security when sneaking around if enough pills are consumed due to assclapping. Be dummy thick responsibly."
/obj/item/storage/pill_bottle/butt_enlargement/PopulateContents()
for(var/i in 1 to 10)
new /obj/item/reagent_containers/pill/butt_enlargement(src)
/obj/item/storage/pill_bottle/neurine
name = "bottle of neurine pills"
desc = "Contains pills to treat non-severe mental traumas."
@@ -551,6 +559,9 @@
new /obj/item/reagent_containers/glass/bottle/vial/small/penisreduction(src)
new /obj/item/reagent_containers/glass/bottle/vial/small/penisreduction(src)
new /obj/item/reagent_containers/glass/bottle/vial/small/penisreduction(src)
new /obj/item/reagent_containers/glass/bottle/vial/small/buttreduction(src)
new /obj/item/reagent_containers/glass/bottle/vial/small/buttreduction(src)
new /obj/item/reagent_containers/glass/bottle/vial/small/buttreduction(src)
/obj/item/storage/hypospraykit/brute
name = "brute trauma hypospray kit"
code/game/objects/items/storage/lockbox.dm
+1 -1
View File
@@ -217,7 +217,7 @@
var/datum/bank_account/buyer_account
var/privacy_lock = TRUE
/obj/item/storage/lockbox/order/Initialize(datum/bank_account/_buyer_account)
/obj/item/storage/lockbox/order/Initialize(mapload, datum/bank_account/_buyer_account)
. = ..()
buyer_account = _buyer_account
code/game/objects/items/storage/toolbox.dm
+1 -1
View File
@@ -400,7 +400,7 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons)
attack_verb = list("robusted", "bounced")
can_rubberify = FALSE //we are already the future.
/obj/item/storage/toolbox/rubber/Initialize()
/obj/item/storage/toolbox/rubber/Initialize(mapload)
icon_state = pick("blue", "red", "yellow", "green")
item_state = "toolbox_[icon_state]"
if(!GLOB.rubber_toolbox_icons[icon_state])
code/game/objects/items/storage/uplink_kits.dm
+1 -1
View File
@@ -447,7 +447,7 @@
/obj/item/paper/contractor_guide
name = "Contractor Guide"
/obj/item/paper/contractor_guide/Initialize()
/obj/item/paper/contractor_guide/Initialize(mapload)
info = {"<p>Welcome agent, congratulations on your new position as contractor. On top of your already assigned objectives,
this kit will provide you contracts to take on for TC payments.</p>
<p>Provided within, we give your specialist contractor space suit. It's even more compact, being able to fit into a pocket, and faster than the