diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 8d44a67eb54..cad893c7711 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -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 diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 9d8a922134d..4bedba8aa66 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -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 diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 1858a9c9024..21eec20fad2 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -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() diff --git a/code/modules/paperwork/contract.dm b/code/modules/paperwork/contract.dm deleted file mode 100644 index 63dede6353e..00000000000 --- a/code/modules/paperwork/contract.dm +++ /dev/null @@ -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 = "
Conditions of Employment




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).\ -
WITNESSETH:
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.\ -
WHEREAS, the omnipresent and helpful watcher of humanity agrees to sporadically provide payment to SLAVE, in exchange for permanent servitude.\ -
NOW THEREFORE in consideration of the mutual covenants herein contained, and other good and valuable consideration, the parties hereto mutually agree as follows:\ -
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.\ -
Further, SLAVE agrees to transfer ownership of his or her soul to the loyalty department of the omnipresent and helpful watcher of humanity.\ -
Should transfership of a soul not be possible, a lien shall be placed instead.
Signed,
[target]" diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index dcc332c7024..7203120aa2b 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -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, "[src] is jammed, give it a few seconds.") - 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 diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index c708ef12d0a..0d78d106f83 100644 Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ diff --git a/paradise.dme b/paradise.dme index 3ebe54cb774..9119d30949a 100644 --- a/paradise.dme +++ b/paradise.dme @@ -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"