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

critical

Browse Source
This commit is contained in:
Timothy Teakettle
2020-10-20 02:11:08 +01:00
parent 8e72c61d2d
commit 4afceebcc1
8 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/gangs/gang.dm
+4 -4
View File
@@ -197,7 +197,7 @@
if(gangtool)//Here is where all of the text occurs when a gang boss first spawns in.
var/obj/item/device/gangtool/G = new()
var/where = H.equip_in_one_of_slots(G, slots)
var/where = H.equip_in_one_of_slots(G, slots, critical = TRUE)
if (!where)
to_chat(H, "Your Syndicate benefactors were unfortunately unable to get you a Gangtool.")
else
@@ -207,7 +207,7 @@
if(pen)
var/obj/item/pen/gang/T = new()
var/where2 = H.equip_in_one_of_slots(T, slots)
var/where2 = H.equip_in_one_of_slots(T, slots, critical = TRUE)
if (!where2)
to_chat(H, "Your Syndicate benefactors were unfortunately unable to get you a recruitment pen to start.")
else
@@ -215,7 +215,7 @@
if(spraycan)
var/obj/item/toy/crayon/spraycan/gang/SC = new(null,gang)
var/where3 = H.equip_in_one_of_slots(SC, slots)
var/where3 = H.equip_in_one_of_slots(SC, slots, critical = TRUE)
if (!where3)
to_chat(H, "Your Syndicate benefactors were unfortunately unable to get you a territory spraycan to start.")
else
@@ -223,7 +223,7 @@
if(hud)
var/obj/item/clothing/glasses/hud/security/chameleon/C = new(null,gang)
var/where4 = H.equip_in_one_of_slots(C, slots)
var/where4 = H.equip_in_one_of_slots(C, slots, critical = TRUE)
if (!where4)
to_chat(H, "Your Syndicate benefactors were unfortunately unable to get you a chameleon security HUD.")
else
code/game/gamemodes/objective.dm
+2 -2
View File
@@ -166,7 +166,7 @@ If not set, defaults to check_completion instead. Set it. It's used by cryo.
var/list/slots = list("backpack" = SLOT_IN_BACKPACK)
for(var/eq_path in special_equipment)
var/obj/O = new eq_path
H.equip_in_one_of_slots(O, slots)
H.equip_in_one_of_slots(O, slots, critical = TRUE)
/datum/objective/assassinate
name = "assasinate"
@@ -1152,7 +1152,7 @@ GLOBAL_LIST_EMPTY(cult_contraband)
I.forceMove(get_turf(owner))
if(ishuman(owner))
var/mob/living/carbon/human/H = owner
H.equip_in_one_of_slots(I, list("backpack" = SLOT_IN_BACKPACK))
H.equip_in_one_of_slots(I, list("backpack" = SLOT_IN_BACKPACK), critical = TRUE)
hoarded_item = I