Removes devil code leftovers. Fixing a human GC issue (#17216)

This commit is contained in:
Farie82
2021-12-13 18:34:34 +01:00
committed by GitHub
parent 53f5e47f8c
commit bdb731a0f6
7 changed files with 7 additions and 102 deletions
+7 -7
View File
@@ -8008,12 +8008,6 @@
"auq" = (
/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_3)
"aur" = (
/obj/structure/filingcabinet/employment,
/turf/simulated/floor/plasteel{
icon_state = "cult"
},
/area/lawoffice)
"aut" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -80010,6 +80004,12 @@
},
/turf/simulated/floor/carpet/arcade,
/area/crew_quarters/arcade)
"fpa" = (
/obj/structure/filingcabinet,
/turf/simulated/floor/plasteel{
icon_state = "cult"
},
/area/lawoffice)
"fqV" = (
/obj/effect/decal/warning_stripes/north,
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
@@ -107460,7 +107460,7 @@ aIo
aoa
aKw
asO
aur
fpa
avQ
axp
ayH
-1
View File
@@ -218,7 +218,6 @@ GLOBAL_VAR_INIT(record_id_num, 1001)
L.fields["enzymes"] = H.dna.SE // Used in respawning
L.fields["identity"] = H.dna.UI // "
L.fields["image"] = getFlatIcon(H) //This is god-awful
L.fields["reference"] = H
locked += L
return
@@ -370,7 +370,6 @@
if(!IsAdminJob(rank))
GLOB.data_core.manifest_inject(character)
AnnounceArrival(character, rank, join_message)
AddEmploymentContract(character)
if(GLOB.summon_guns_triggered)
give_guns(character)
@@ -415,13 +414,6 @@
rank = character.mind.role_alt_title
GLOB.global_announcer.autosay("[character.real_name],[rank ? " [rank]," : " visitor," ] [join_message ? join_message : "has arrived on the station"].", "Arrivals Announcement Computer")
/mob/new_player/proc/AddEmploymentContract(mob/living/carbon/human/employee)
spawn(30)
for(var/C in GLOB.employmentCabinets)
var/obj/structure/filingcabinet/employment/employmentCabinet = C
if(employmentCabinet.populated)
employmentCabinet.addFile(employee)
/mob/new_player/proc/AnnounceCyborg(mob/living/character, rank, join_message)
if(SSticker.current_state == GAME_STATE_PLAYING)
var/ailist[] = list()
-37
View File
@@ -1,37 +0,0 @@
/* For employment contracts and infernal contracts */
/obj/item/paper/contract
throw_range = 3
throw_speed = 3
var/signed = FALSE
var/datum/mind/target
flags = NOBLUDGEON
/obj/item/paper/contract/proc/update_text()
return
/obj/item/paper/contract/update_icon()
return
/obj/item/paper/contract/employment
icon_state = "good_contract"
signed = TRUE
/obj/item/paper/contract/employment/New(atom/loc, mob/living/nOwner)
. = ..()
if(!nOwner || !nOwner.mind)
qdel(src)
return -1
target = nOwner.mind
update_text()
/obj/item/paper/contract/employment/update_text()
name = "paper- [target] employment contract"
info = "<center>Conditions of Employment</center><BR><BR><BR><BR>This Agreement is made and entered into as of the date of last signature below, by and between [target] (hereafter referred to as SLAVE), and Nanotrasen (hereafter referred to as the omnipresent and helpful watcher of humanity).\
<BR>WITNESSETH:<BR>WHEREAS, SLAVE is a natural born human or humanoid, possessing skills upon which he or she can aid the omnipresent and helpful watcher of humanity, who seeks employment in the omnipresent and helpful watcher of humanity.\
<BR>WHEREAS, the omnipresent and helpful watcher of humanity agrees to sporadically provide payment to SLAVE, in exchange for permanent servitude.\
<BR>NOW THEREFORE in consideration of the mutual covenants herein contained, and other good and valuable consideration, the parties hereto mutually agree as follows:\
<BR>In exchange for paltry payments, SLAVE agrees to work for the omnipresent and helpful watcher of humanity, for the remainder of his or her current and future lives.\
<BR>Further, SLAVE agrees to transfer ownership of his or her soul to the loyalty department of the omnipresent and helpful watcher of humanity.\
<BR>Should transfership of a soul not be possible, a lien shall be placed instead.<BR>Signed,<BR><i>[target]</i>"
-48
View File
@@ -175,51 +175,3 @@
/obj/structure/filingcabinet/medical/attack_tk()
populate()
..()
/*
* Employment contract Cabinets
*/
GLOBAL_LIST_EMPTY(employmentCabinets)
/obj/structure/filingcabinet/employment
var/cooldown = FALSE // Only used for devils
icon_state = "employmentcabinet"
var/populated = FALSE
/obj/structure/filingcabinet/employment/Initialize(mapload)
. = ..()
GLOB.employmentCabinets += src
/obj/structure/filingcabinet/employment/Destroy()
GLOB.employmentCabinets -= src
return ..()
/obj/structure/filingcabinet/employment/proc/fillCurrent()
//This proc fills the cabinet with the current crew.
for(var/record in GLOB.data_core.locked)
var/datum/data/record/G = record
if(!G)
continue
if(G.fields["reference"])
addFile(G.fields["reference"])
/obj/structure/filingcabinet/employment/proc/addFile(mob/living/carbon/human/employee)
new /obj/item/paper/contract/employment(src, employee)
/obj/structure/filingcabinet/employment/attack_hand(mob/user)
if(cooldown)
to_chat(user, "<span class='warning'>[src] is jammed, give it a few seconds.</span>")
else
if(!populated)
fillCurrent()
populated = TRUE
if(user.mind.special_role != "devil")
return ..()
else
cooldown = TRUE
..()
sleep(10 SECONDS) // prevents the devil from just instantly emptying the cabinet, ensuring an easy win.
cooldown = FALSE
Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 25 KiB

-1
View File
@@ -2188,7 +2188,6 @@
#include "code\modules\ninja\suit\suit_initialisation.dm"
#include "code\modules\paperwork\carbonpaper.dm"
#include "code\modules\paperwork\clipboard.dm"
#include "code\modules\paperwork\contract.dm"
#include "code\modules\paperwork\fax.dm"
#include "code\modules\paperwork\faxmachine.dm"
#include "code\modules\paperwork\filingcabinet.dm"