Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 782ab6f

Browse filesBrowse files
13spacemen13spacemen
authored
mimes get their own mime hugbox, removed plasmaman specific survival boxes, survival box hugboxes are subtypes now; general code improvements (yogstation13#21535)
1 parent 348770f commit 782ab6f
Copy full SHA for 782ab6f

26 files changed

+102-182Lines changed: 102 additions & 182 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎code/_globalvars/lists/maintenance_loot.dm‎

Copy file name to clipboardExpand all lines: code/_globalvars/lists/maintenance_loot.dm
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,8 @@ GLOBAL_LIST_INIT(maintenance_loot_minor,list(
655655
/obj/item/storage/box/cups = W_RARE,
656656
/obj/item/storage/box/drinkingglasses = W_UNCOMMON,
657657
/obj/item/storage/box/gloves = W_RARE,
658-
/obj/item/storage/box/hug/survival = W_UNCOMMON,
658+
/obj/item/storage/box/survival/hug = W_UNCOMMON,
659+
/obj/item/storage/box/survival/hug/black = W_UNCOMMON,
659660
/obj/item/storage/box/masks = W_RARE,
660661
/obj/item/storage/box/pillbottles = W_RARE,
661662
/obj/item/storage/box/rxglasses = W_RARE,
@@ -760,7 +761,6 @@ GLOBAL_LIST_INIT(maintenance_loot_minor,list(
760761
/obj/item/storage/box/hug/medical = W_MYTHICAL,
761762
/obj/item/storage/box/mixedcubes = W_RARE,
762763
/obj/item/storage/box/monkeycubes = W_RARE,
763-
/obj/item/storage/box/plasmaman = W_RARE,
764764
/obj/item/storage/box/smart_metal_foam = W_RARE,
765765
/obj/item/storage/firstaid = W_MYTHICAL,
766766
/obj/item/storage/firstaid/ancient = W_MYTHICAL,
Collapse file

‎code/game/gamemodes/clock_cult/clock_cult.dm‎

Copy file name to clipboardExpand all lines: code/game/gamemodes/clock_cult/clock_cult.dm
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,8 +274,9 @@ Credit where due:
274274
ears = /obj/item/radio/headset
275275
gloves = /obj/item/clothing/gloves/color/yellow //Take them off if you want
276276
belt = /obj/item/storage/belt/utility/servant //Take this off and pour it into a toolbox if you want
277-
backpack_contents = list(/obj/item/storage/box/engineer = 1, \
278-
/obj/item/clockwork/replica_fabricator = 1, /obj/item/stack/tile/brass/fifty = 1, /obj/item/paper/servant_primer = 1)
277+
box = /obj/item/storage/box/survival/engineer
278+
backpack_contents = list(/obj/item/clockwork/replica_fabricator = 1,\
279+
/obj/item/stack/tile/brass/fifty = 1, /obj/item/paper/servant_primer = 1)
279280

280281
var/obj/item/id_type = /obj/item/card/id
281282
var/obj/item/modular_computer/pda_type = /obj/item/modular_computer/tablet/pda/preset/basic
Collapse file

‎code/game/gamemodes/clown_ops/clown_ops.dm‎

Copy file name to clipboardExpand all lines: code/game/gamemodes/clown_ops/clown_ops.dm
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@
3737
l_pocket = /obj/item/pinpointer/nuke/syndicate
3838
r_pocket = /obj/item/bikehorn
3939
id = /obj/item/card/id/syndicate
40-
backpack_contents = list(/obj/item/storage/box/syndie=1,\
41-
/obj/item/kitchen/knife/combat/survival,
40+
backpack_contents = list(/obj/item/kitchen/knife/combat/survival,\
4241
/obj/item/reagent_containers/spray/waterflower/lube)
4342
implants = list(/obj/item/implant/sad_trombone)
4443

Collapse file

‎code/game/gamemodes/nuclear/nuclear.dm‎

Copy file name to clipboardExpand all lines: code/game/gamemodes/nuclear/nuclear.dm
+3-4Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@
124124
l_pocket = /obj/item/pinpointer/nuke/syndicate
125125
id = /obj/item/card/id/syndicate
126126
belt = /obj/item/gun/ballistic/automatic/pistol
127-
backpack_contents = list(/obj/item/storage/box/syndie=1,\
128-
/obj/item/kitchen/knife/combat/survival)
127+
box = /obj/item/storage/box/survival/syndie
128+
backpack_contents = list(/obj/item/kitchen/knife/combat/survival)
129129

130130
var/tc = 25
131131
var/command_radio = FALSE
@@ -174,8 +174,7 @@
174174
internals_slot = ITEM_SLOT_RPOCKET
175175
belt = /obj/item/storage/belt/military
176176
r_hand = /obj/item/gun/ballistic/shotgun/bulldog
177-
backpack_contents = list(/obj/item/storage/box/syndie=1,\
178-
/obj/item/tank/jetpack/oxygen/harness=1,\
177+
backpack_contents = list(/obj/item/tank/jetpack/oxygen/harness=1,\
179178
/obj/item/gun/ballistic/automatic/pistol=1,\
180179
/obj/item/kitchen/knife/combat/survival)
181180

Collapse file

‎code/game/objects/items/storage/boxes.dm‎

Copy file name to clipboardExpand all lines: code/game/objects/items/storage/boxes.dm
+54-40Lines changed: 54 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,18 @@
123123
new /obj/item/disk/nanite_program(src)
124124

125125
// Ordinary survival box
126+
/obj/item/storage/box/survival
127+
var/mask_type = /obj/item/clothing/mask/breath
128+
var/internal_type = /obj/item/tank/internals/emergency_oxygen
129+
var/medipen_type = /obj/item/reagent_containers/autoinjector/medipen
130+
126131
/obj/item/storage/box/survival/PopulateContents()
127-
new /obj/item/clothing/mask/breath(src)
128-
new /obj/item/tank/internals/emergency_oxygen(src)
129-
new /obj/item/reagent_containers/autoinjector/medipen(src)
132+
if(!isnull(mask_type))
133+
new mask_type(src)
134+
if(!isnull(internal_type))
135+
new internal_type(src)
136+
if(!isnull(medipen_type))
137+
new medipen_type(src)
130138

131139
if(HAS_TRAIT(SSstation, STATION_TRAIT_PREMIUM_INTERNALS))
132140
new /obj/item/flashlight/flare(src)
@@ -145,51 +153,62 @@
145153
qdel(mask) // Get rid of the items that shouldn't be
146154
qdel(internals)
147155

148-
/obj/item/storage/box/survival_mining/PopulateContents()
149-
new /obj/item/clothing/mask/gas/explorer(src)
150-
new /obj/item/tank/internals/emergency_oxygen(src)
156+
/obj/item/storage/box/survival/mining
157+
mask_type = /obj/item/clothing/mask/gas/explorer
158+
159+
/obj/item/storage/box/survival/mining/PopulateContents()
160+
..()
151161
new /obj/item/crowbar/red(src)
152162
new /obj/item/gps/mining(src)
153-
new /obj/item/reagent_containers/autoinjector/medipen(src)
154163

155164
// Engineer survival box
156-
/obj/item/storage/box/engineer/PopulateContents()
157-
new /obj/item/clothing/mask/breath(src)
158-
new /obj/item/tank/internals/emergency_oxygen/engi(src)
159-
new /obj/item/reagent_containers/autoinjector/medipen(src)
165+
/obj/item/storage/box/survival/engineer
166+
internal_type = /obj/item/tank/internals/emergency_oxygen/engi
160167

161-
/obj/item/storage/box/engineer/radio/PopulateContents()
168+
/obj/item/storage/box/survival/engineer/radio/PopulateContents()
162169
..() // we want the regular items too.
163170
new /obj/item/radio/off(src)
164171

165172
// Syndie survival box
166-
/obj/item/storage/box/syndie/PopulateContents()
167-
new /obj/item/clothing/mask/gas/syndicate(src)
168-
new /obj/item/tank/internals/emergency_oxygen/engi(src)
173+
/obj/item/storage/box/survival/syndie
174+
mask_type = /obj/item/clothing/mask/gas/syndicate
175+
internal_type = /obj/item/tank/internals/emergency_oxygen/engi
176+
177+
/obj/item/storage/box/survival/syndie/PopulateContents()
178+
..()
169179
new /obj/item/extinguisher/mini(src)
170180

171181
// Security survival box
172-
/obj/item/storage/box/security/PopulateContents()
173-
new /obj/item/clothing/mask/gas/sechailer(src)
174-
new /obj/item/tank/internals/emergency_oxygen(src)
175-
new /obj/item/reagent_containers/autoinjector/medipen(src)
182+
/obj/item/storage/box/survival/security
183+
mask_type = /obj/item/clothing/mask/gas/sechailer
176184

177-
/obj/item/storage/box/security/radio/PopulateContents()
185+
/obj/item/storage/box/survival/security/radio/PopulateContents()
178186
..() // we want the regular stuff too
179187
new /obj/item/radio/off(src)
180188

181-
// Plasmaman survival box
182-
/obj/item/storage/box/plasmaman/PopulateContents()
183-
new /obj/item/clothing/mask/breath(src)
184-
new /obj/item/tank/internals/plasmaman/belt/full(src)
185-
new /obj/item/reagent_containers/autoinjector/medipen(src)
189+
//Clown survival box
190+
/obj/item/storage/box/survival/hug
191+
name = "box of hugs"
192+
desc = "A special box for sensitive people."
193+
icon_state = "hugbox"
194+
illustration = "heart"
195+
mask_type = null
196+
foldable = null
186197

187-
/obj/item/storage/box/plasmaman/miner/PopulateContents() //mining box for plasmemes
188-
new /obj/item/clothing/mask/gas/explorer(src)
189-
new /obj/item/tank/internals/plasmaman/belt/full(src)
190-
new /obj/item/crowbar/red(src)
191-
new /obj/item/gps/mining(src)
192-
new /obj/item/reagent_containers/autoinjector/medipen(src)
198+
/obj/item/storage/box/survival/hug/suicide_act(mob/user)
199+
user.visible_message(span_suicide("[user] clamps the box of hugs on [user.p_their()] jugular! Guess it wasn't such a hugbox after all.."))
200+
return (BRUTELOSS)
201+
202+
/obj/item/storage/box/survival/hug/attack_self(mob/user)
203+
..()
204+
user.changeNext_move(CLICK_CD_MELEE)
205+
playsound(loc, "rustle", 50, vary = TRUE, extrarange = -5)
206+
user.visible_message(span_notice("[user] hugs [src]."), span_notice("You hug [src]."))
207+
208+
//Mime survival box
209+
/obj/item/storage/box/survival/hug/black
210+
icon_state = "hugbox_black"
211+
illustration = "heart_black"
193212

194213
/obj/item/storage/box/gloves
195214
name = "box of latex gloves"
@@ -841,6 +860,10 @@
841860
playsound(loc, "rustle", 50, 1, -5)
842861
user.visible_message(span_notice("[user] hugs \the [src]."),span_notice("You hug \the [src]."))
843862

863+
/obj/item/storage/box/hug/black
864+
icon_state = "hugbox_black"
865+
illustration = "heart_black"
866+
844867
/////clown box & honkbot assembly
845868
/obj/item/storage/box/clown
846869
name = "clown box"
@@ -868,15 +891,6 @@
868891
new /obj/item/stack/medical/ointment(src)
869892
new /obj/item/reagent_containers/autoinjector/medipen(src)
870893

871-
/obj/item/storage/box/hug/survival/PopulateContents()
872-
new /obj/item/clothing/mask/breath(src)
873-
new /obj/item/tank/internals/emergency_oxygen(src)
874-
new /obj/item/reagent_containers/autoinjector/medipen(src)
875-
876-
if(HAS_TRAIT(SSstation, STATION_TRAIT_PREMIUM_INTERNALS))
877-
new /obj/item/flashlight/flare(src)
878-
new /obj/item/radio/off(src)
879-
880894
/obj/item/storage/box/rubbershot
881895
name = "box of rubber shots"
882896
desc = "A box full of rubber shots designed for shotguns. The box itself is designed for holding any kind of shotgun shell."
Collapse file

‎code/game/objects/structures/ghost_role_spawners.dm‎

Copy file name to clipboardExpand all lines: code/game/objects/structures/ghost_role_spawners.dm
+2-31Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -543,9 +543,7 @@ GLOBAL_LIST_EMPTY(servant_golem_users)
543543
implants = list(/obj/item/implant/weapons_auth)
544544
id = /obj/item/card/id/syndicate
545545
back = /obj/item/storage/backpack
546-
backpack_contents = list(
547-
/obj/item/storage/box/syndie
548-
)
546+
box = /obj/item/storage/box/survival/syndie
549547

550548
/datum/outfit/syndicate_empty/post_equip(mob/living/carbon/human/H)
551549
H.faction |= ROLE_SYNDICATE
@@ -563,9 +561,6 @@ GLOBAL_LIST_EMPTY(servant_golem_users)
563561
r_pocket = /obj/item/kitchen/knife/combat/survival
564562
belt = /obj/item/storage/belt/military/assault
565563
back = /obj/item/storage/backpack
566-
backpack_contents = list(
567-
/obj/item/storage/box/syndie
568-
)
569564

570565
/obj/effect/mob_spawn/human/syndicate/battlecruiser/assault
571566
name = "Syndicate Battlecruiser Assault Operative"
@@ -584,9 +579,6 @@ GLOBAL_LIST_EMPTY(servant_golem_users)
584579
suit_store = /obj/item/gun/ballistic/automatic/pistol
585580
back = /obj/item/storage/backpack/security
586581
mask = /obj/item/clothing/mask/gas/syndicate
587-
backpack_contents = list(
588-
/obj/item/storage/box/syndie
589-
)
590582

591583
/obj/effect/mob_spawn/human/syndicate/battlecruiser/captain
592584
name = "Syndicate Battlecruiser Captain"
@@ -606,9 +598,6 @@ GLOBAL_LIST_EMPTY(servant_golem_users)
606598
head = /obj/item/clothing/head/HoS/syndicate
607599
mask = /obj/item/clothing/mask/cigarette/cigar/havana
608600
glasses = /obj/item/clothing/glasses/thermal/eyepatch
609-
backpack_contents = list(
610-
/obj/item/storage/box/syndie
611-
)
612601

613602
//Icemoon Syndicate. Players become research agents working under a Syndicate research station.
614603
/obj/effect/mob_spawn/human/syndicate/icemoon_syndicate //generic version
@@ -628,9 +617,6 @@ GLOBAL_LIST_EMPTY(servant_golem_users)
628617
mask = /obj/item/clothing/mask/gas/syndicate
629618
id = /obj/item/card/id/syndicate/anyone
630619
back = /obj/item/storage/backpack
631-
backpack_contents = list(
632-
/obj/item/storage/box/syndie
633-
)
634620

635621
/obj/effect/mob_spawn/human/syndicate/icemoon_syndicate/security
636622
name = "Syndicate Outpost Security Officer"
@@ -647,9 +633,6 @@ GLOBAL_LIST_EMPTY(servant_golem_users)
647633
belt = /obj/item/storage/belt/security/full //take like one guy alive
648634
glasses = /obj/item/clothing/glasses/hud/security/sunglasses //identify the job of whoever the fuck is breaking in at a glance
649635
back = /obj/item/storage/backpack
650-
backpack_contents = list(
651-
/obj/item/storage/box/syndie
652-
)
653636

654637
/obj/effect/mob_spawn/human/syndicate/icemoon_syndicate/sci
655638
name = "Syndicate Outpost Researcher"
@@ -665,9 +648,6 @@ GLOBAL_LIST_EMPTY(servant_golem_users)
665648
accessory = /obj/item/clothing/accessory/armband/science
666649
glasses = /obj/item/clothing/glasses/hud/diagnostic/sunglasses/rd //it's a syndicate nerd
667650
back = /obj/item/storage/backpack
668-
backpack_contents = list(
669-
/obj/item/storage/box/syndie
670-
)
671651

672652
/obj/effect/mob_spawn/human/syndicate/icemoon_syndicate/engineer
673653
name = "Syndicate Outpost Engineer"
@@ -684,9 +664,6 @@ GLOBAL_LIST_EMPTY(servant_golem_users)
684664
accessory = /obj/item/clothing/accessory/armband/engine
685665
glasses = /obj/item/clothing/glasses/meson/sunglasses/ce
686666
back = /obj/item/storage/backpack
687-
backpack_contents = list(
688-
/obj/item/storage/box/syndie
689-
)
690667

691668
/obj/effect/mob_spawn/human/syndicate/icemoon_syndicate/medic
692669
name = "Syndicate Outpost Doctor"
@@ -702,9 +679,6 @@ GLOBAL_LIST_EMPTY(servant_golem_users)
702679
glasses = /obj/item/clothing/glasses/hud/health/sunglasses/cmo //rapid hurt and chemical identification
703680
accessory = /obj/item/clothing/accessory/armband/medblue
704681
back = /obj/item/storage/backpack
705-
backpack_contents = list(
706-
/obj/item/storage/box/syndie
707-
)
708682

709683
/obj/effect/mob_spawn/human/syndicate/icemoon_syndicate/commander
710684
name = "Syndicate Outpost Commander"
@@ -727,7 +701,6 @@ GLOBAL_LIST_EMPTY(servant_golem_users)
727701
suit_store = /obj/item/gun/ballistic/revolver
728702
belt = /obj/item/storage/belt/sabre //ceremonial shamnk
729703
backpack_contents = list(
730-
/obj/item/storage/box/syndie,
731704
/obj/item/modular_computer/tablet/preset/syndicate=1,
732705
/obj/item/ammo_box/a357=2,
733706
/obj/item/melee/classic_baton/telescopic=1
@@ -936,9 +909,7 @@ GLOBAL_LIST_EMPTY(servant_golem_users)
936909
l_pocket = /obj/item/flashlight
937910
r_pocket = /obj/item/kitchen/knife/combat/survival
938911
implants = list(/obj/item/implant/weapons_auth)
939-
backpack_contents = list(
940-
/obj/item/storage/box/syndie
941-
)
912+
box = /obj/item/storage/box/survival/syndie
942913

943914
/datum/outfit/syndicate_derelict_engi/post_equip(mob/living/carbon/human/H)
944915
H.faction |= ROLE_SYNDICATE

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.