April sync (#360)
* Maps and things no code/icons * helpers defines globalvars * Onclick world.dm orphaned_procs * subsystems Round vote and shuttle autocall done here too * datums * Game folder * Admin - chatter modules * clothing - mining * modular computers - zambies * client * mob level 1 * mob stage 2 + simple_animal * silicons n brains * mob stage 3 + Alien/Monkey * human mobs * icons updated * some sounds * emitter y u no commit * update tgstation.dme * compile fixes * travis fixes Also removes Fast digest mode, because reasons. * tweaks for travis Mentors are broke again Also fixes Sizeray guns * oxygen loss fix for vore code. * removes unused code * some code updates * bulk fixes * further fixes * outside things * whoops. * Maint bar ported * GLOBs.
This commit is contained in:
@@ -120,8 +120,8 @@
|
||||
|
||||
/obj/structure/filingcabinet/security/proc/populate()
|
||||
if(virgin)
|
||||
for(var/datum/data/record/G in data_core.general)
|
||||
var/datum/data/record/S = find_record("name", G.fields["name"], data_core.security)
|
||||
for(var/datum/data/record/G in GLOB.data_core.general)
|
||||
var/datum/data/record/S = find_record("name", G.fields["name"], GLOB.data_core.security)
|
||||
if(!S)
|
||||
continue
|
||||
var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(src)
|
||||
@@ -152,8 +152,8 @@
|
||||
|
||||
/obj/structure/filingcabinet/medical/proc/populate()
|
||||
if(virgin)
|
||||
for(var/datum/data/record/G in data_core.general)
|
||||
var/datum/data/record/M = find_record("name", G.fields["name"], data_core.medical)
|
||||
for(var/datum/data/record/G in GLOB.data_core.general)
|
||||
var/datum/data/record/M = find_record("name", G.fields["name"], GLOB.data_core.medical)
|
||||
if(!M)
|
||||
continue
|
||||
var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(src)
|
||||
@@ -179,7 +179,7 @@
|
||||
* Employment contract Cabinets
|
||||
*/
|
||||
|
||||
var/list/employmentCabinets = list()
|
||||
GLOBAL_LIST_EMPTY(employmentCabinets)
|
||||
|
||||
/obj/structure/filingcabinet/employment
|
||||
var/cooldown = 0
|
||||
@@ -187,16 +187,16 @@ var/list/employmentCabinets = list()
|
||||
var/virgin = 1
|
||||
|
||||
/obj/structure/filingcabinet/employment/New()
|
||||
employmentCabinets += src
|
||||
GLOB.employmentCabinets += src
|
||||
return ..()
|
||||
|
||||
/obj/structure/filingcabinet/employment/Destroy()
|
||||
employmentCabinets -= src
|
||||
GLOB.employmentCabinets -= src
|
||||
return ..()
|
||||
|
||||
/obj/structure/filingcabinet/employment/proc/fillCurrent()
|
||||
//This proc fills the cabinet with the current crew.
|
||||
for(var/record in data_core.locked)
|
||||
for(var/record in GLOB.data_core.locked)
|
||||
var/datum/data/record/G = record
|
||||
if(!G)
|
||||
continue
|
||||
|
||||
@@ -49,11 +49,8 @@
|
||||
if(length(A.name) + length(label) > 64)
|
||||
to_chat(user, "<span class='warning'>Label too big!</span>")
|
||||
return
|
||||
if(ishuman(A))
|
||||
to_chat(user, "<span class='warning'>You can't label humans!</span>")
|
||||
return
|
||||
if(issilicon(A))
|
||||
to_chat(user, "<span class='warning'>You can't label cyborgs!</span>")
|
||||
if(ismob(A))
|
||||
to_chat(user, "<span class='warning'>You can't label creatures!</span>") // use a collar
|
||||
return
|
||||
|
||||
user.visible_message("[user] labels [A] as [label].", \
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
gender = NEUTER
|
||||
icon = 'icons/obj/bureaucracy.dmi'
|
||||
icon_state = "paper"
|
||||
item_state = "paper"
|
||||
throwforce = 0
|
||||
w_class = WEIGHT_CLASS_TINY
|
||||
throw_range = 1
|
||||
@@ -107,7 +108,7 @@
|
||||
|
||||
/obj/item/weapon/paper/attack_self(mob/user)
|
||||
user.examinate(src)
|
||||
if(rigged && (SSevent.holidays && SSevent.holidays[APRIL_FOOLS]))
|
||||
if(rigged && (SSevents.holidays && SSevents.holidays[APRIL_FOOLS]))
|
||||
if(spam_flag == 0)
|
||||
spam_flag = 1
|
||||
playsound(loc, 'sound/items/bikehorn.ogg', 50, 1)
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
bin_pen = P
|
||||
update_icon()
|
||||
var/static/warned = FALSE
|
||||
if(!warned)
|
||||
if(P.type == /obj/item/weapon/pen && !warned)
|
||||
warning("one or more paperbins ate a pen duing initialize()")
|
||||
warned = TRUE
|
||||
|
||||
@@ -86,7 +86,7 @@
|
||||
papers.Remove(P)
|
||||
else
|
||||
P = new papertype(src)
|
||||
if(SSevent.holidays && SSevent.holidays[APRIL_FOOLS])
|
||||
if(SSevents.holidays && SSevents.holidays[APRIL_FOOLS])
|
||||
if(prob(30))
|
||||
P.info = "<font face=\"[CRAYON_FONT]\" color=\"red\"><b>HONK HONK HONK HONK HONK HONK HONK<br>HOOOOOOOOOOOOOOOOOOOOOONK<br>APRIL FOOLS</b></font>"
|
||||
P.rigged = 1
|
||||
|
||||
@@ -284,7 +284,7 @@
|
||||
var/list/turfs = list()
|
||||
for(var/turf/T in range(1, target))
|
||||
if(T in seen)
|
||||
if(isAi && !cameranet.checkTurfVis(T))
|
||||
if(isAi && !GLOB.cameranet.checkTurfVis(T))
|
||||
continue
|
||||
else
|
||||
turfs += T
|
||||
|
||||
@@ -78,8 +78,9 @@
|
||||
var/list/stamp_types
|
||||
var/list/stamp_names
|
||||
|
||||
/obj/item/weapon/stamp/chameleon/New()
|
||||
stamp_types = typesof(/obj/item/weapon/stamp) - src.type // Get all stamp types except our own
|
||||
/obj/item/weapon/stamp/chameleon/Initialize()
|
||||
. = ..()
|
||||
stamp_types = typesof(/obj/item/weapon/stamp) - type // Get all stamp types except our own
|
||||
|
||||
stamp_names = list()
|
||||
// Generate them into a list
|
||||
|
||||
Reference in New Issue
Block a user