cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 14:47:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] More globals (#12341)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2026-01-30 20:27:42 +01:00
committed by GitHub
co-authored by Kashargul
parent 38e634dce7
commit d031fa3c4e
76 changed files with 267 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/RMS.dm
+4 -3
View File
@@ -5,7 +5,7 @@
#define RMS_STONE 5
#define RMS_RAND 6
var/list/RMS_random_malfunction = list(/obj/item/fbp_backup_cell,
GLOBAL_LIST_INIT(RMS_random_malfunction, list(/obj/item/fbp_backup_cell,
/obj/item/trash/rkibble,
/obj/item/clothing/gloves/bluespace/deluxe,
/obj/item/flame/lighter/supermatter/syndismzippo,
@@ -20,7 +20,8 @@ var/list/RMS_random_malfunction = list(/obj/item/fbp_backup_cell,
/obj/item/clothing/shoes/clown_shoes,
/obj/item/clothing/mask/gas/clown_hat,
/obj/item/pda/clown,
/mob/living/simple_mob/vore/catgirl)
/mob/living/simple_mob/vore/catgirl
))
/obj/item/rms
name = "Rapid Material Synthesizer"
@@ -135,7 +136,7 @@ var/list/RMS_random_malfunction = list(/obj/item/fbp_backup_cell,
if(do_after(user, 5, target = A))
if(overcharge)
if(prob(5)) //5% chance for malfunction
var/thing_to_spawn = pick(RMS_random_malfunction)
var/thing_to_spawn = pick(GLOB.RMS_random_malfunction)
product = new thing_to_spawn
else
product = choose_overcharge(user)
code/game/objects/items/weapons/id cards/station_ids.dm
+1 -1
View File
@@ -142,7 +142,7 @@
/obj/item/card/id/Initialize(mapload)
. = ..()
var/datum/job/J = job_master.GetJob(rank)
var/datum/job/J = GLOB.job_master.GetJob(rank)
if(J)
access = J.get_access()
code/game/objects/items/weapons/weaponry.dm
+2 -2
View File
@@ -52,10 +52,10 @@
//Chaplain null rod removes ALL unholy traits.
REMOVE_TRAITS_IN(M, UNHOLY_TRAIT)
if(cult && (M.mind in cult.current_antagonists) && prob(33))
if(GLOB.cult && (M.mind in GLOB.cult.current_antagonists) && prob(33))
to_chat(M, span_danger("The power of [src] clears your mind of the cult's influence!"))
to_chat(user, span_danger("You wave [src] over [M]'s head and see their eyes become clear, their mind returning to normal."))
cult.remove_antagonist(M.mind)
GLOB.cult.remove_antagonist(M.mind)
M.visible_message(span_danger("\The [user] waves \the [src] over \the [M]'s head."))
else
to_chat(user, span_danger("The rod appears to do nothing."))