aaaand the rest of the modules folder

2018-01-04 01:45:38 -05:00
parent 8f593f0d00
commit aabbbb9dff
89 changed files with 629 additions and 788 deletions
@@ -187,7 +187,6 @@ GLOBAL_LIST_EMPTY(employmentCabinets)
 /obj/structure/filingcabinet/employment/Initialize()
 	. = ..()
 	GLOB.employmentCabinets += src
-	return ..()

 /obj/structure/filingcabinet/employment/Destroy()
 	GLOB.employmentCabinets -= src
@@ -199,8 +198,9 @@ GLOBAL_LIST_EMPTY(employmentCabinets)
 		var/datum/data/record/G = record
 		if(!G)
 			continue
-		if(G.fields["reference"])
-			addFile(G.fields["reference"])
+		var/datum/mind/M = G.fields["mindref"]
+		if(M && ishuman(M.current))
+			addFile(M.current)


 /obj/structure/filingcabinet/employment/proc/addFile(mob/living/carbon/human/employee)
@@ -374,4 +374,3 @@

 /obj/item/paper/crumpled/bloody
 	icon_state = "scrap_bloodied"
-
@@ -12,8 +12,8 @@
 	pass_flags = PASSTABLE


-/obj/item/papercutter/New()
-	..()
+/obj/item/papercutter/Initialize()
+	. = ..()
 	storedcutter = new /obj/item/hatchet/cutterblade(src)
 	update_icon()

@@ -111,8 +111,8 @@
 	resistance_flags = FLAMMABLE
 	max_integrity = 50

-/obj/item/paperslip/New()
-	..()
+/obj/item/paperslip/Initialize()
+	. = ..()
 	pixel_x = rand(-5, 5)
 	pixel_y = rand(-5, 5)

@@ -181,7 +181,6 @@
 	reagents.add_reagent("chloralhydrate2", 20)
 	reagents.add_reagent("mutetoxin", 15)
 	reagents.add_reagent("tirizene", 10)
-	..()

 /*
 * (Alan) Edaggers