From be04c81a274b13dd22d1ab74d2d4c4d4ffd8f80a Mon Sep 17 00:00:00 2001 From: "johnsonmt88@gmail.com" Date: Tue, 18 Sep 2012 01:36:40 +0000 Subject: [PATCH] Captains no longer spawns with a cigar in their mouth, instead it spawns on the desk where the captain spawns. CEs no longer spawns with a cigarette in their mouth. I did not add a cigarette to their desk because there is already a cigarette pack that spawns there. Moved some stuff in singularity/New() into its own proc that singularity/New() calls. This is so that I can override it and prevent runtimes with an away mission. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4717 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/jobs/job/captain.dm | 1 - code/game/jobs/job/engineering.dm | 1 - code/modules/power/singularity/singularity.dm | 10 ++++++---- maps/tgstation.2.0.9.dmm | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index ad2d35a89fe..538680dd7fa 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -21,7 +21,6 @@ H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/captain(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/head/caphat(H), slot_head) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar(H), slot_wear_mask) H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses) if(H.backbag == 1) H.equip_to_slot_or_del(new /obj/item/weapon/storage/id_kit(H), slot_r_hand) diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index 987e06a94da..a8420d59011 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -19,7 +19,6 @@ H.equip_to_slot_or_del(new /obj/item/device/pda/heads/ce(H), slot_l_store) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white(H), slot_head) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette(H), slot_wear_mask) H.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/full(H), slot_belt) H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) if(H.backbag == 1) diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index a44808a082f..a37450941fb 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -35,10 +35,7 @@ var/global/list/uneatable = list( /obj/machinery/singularity/New(loc, var/starting_energy = 50, var/temp = 0) //CARN: admin-alert for chuckle-fuckery. - last_warning = world.time - var/count = locate(/obj/machinery/containment_field) in orange(30, src) - if(!count) message_admins("A singulo has been created without containment fields active ([x],[y],[z])",1) - investigate_log("was created. [count?"":"No containment fields were active"]","singulo") + admin_investigate_setup() src.energy = starting_energy if(temp) @@ -108,6 +105,11 @@ var/global/list/uneatable = list( return +/obj/machinery/singularity/proc/admin_investigate_setup() + last_warning = world.time + var/count = locate(/obj/machinery/containment_field) in orange(30, src) + if(!count) message_admins("A singulo has been created without containment fields active ([x],[y],[z])",1) + investigate_log("was created. [count?"":"No containment fields were active"]","singulo") /obj/machinery/singularity/proc/dissipate() if(!dissipate) diff --git a/maps/tgstation.2.0.9.dmm b/maps/tgstation.2.0.9.dmm index 24a8cf7610e..1614bd13ef1 100644 --- a/maps/tgstation.2.0.9.dmm +++ b/maps/tgstation.2.0.9.dmm @@ -2922,7 +2922,7 @@ "bej" = (/obj/structure/rack,/obj/item/weapon/tank/jetpack/oxygen,/obj/item/clothing/mask/gas,/obj/item/clothing/head/helmet/space/capspace,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/machinery/keycard_auth{pixel_x = 0; pixel_y = -24},/turf/simulated/floor/wood,/area/crew_quarters/captain) "bek" = (/obj/structure/stool/bed,/obj/machinery/light_switch{pixel_y = -25},/obj/item/weapon/bedsheet/captain,/turf/simulated/floor/wood,/area/crew_quarters/captain) "bel" = (/obj/structure/closet/secure_closet/captains,/obj/machinery/camera{c_tag = "Captain's Quarters"; dir = 1},/turf/simulated/floor/wood,/area/crew_quarters/captain) -"bem" = (/obj/structure/table/woodentable,/obj/item/weapon/melee/chainofcommand,/turf/simulated/floor/wood,/area/crew_quarters/captain) +"bem" = (/obj/structure/table/woodentable,/obj/item/weapon/melee/chainofcommand,/obj/item/clothing/mask/cigarette/cigar,/turf/simulated/floor/wood,/area/crew_quarters/captain) "ben" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/wood,/area/crew_quarters/captain) "beo" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/wall/r_wall,/area/crew_quarters/captain) "bep" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/turret_protected/ai)