cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-30 03:53:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

-Defined a new area for the prison wing, so ghosts won't teleport to the admin brig by accident

Browse Source 
-Removed prison toilet disposals
-Reduced number of blast doors in prison wing, as it was overkill
-Fixes prison break event to also affect the prison wing
-Restores geneticists' supervisor text and headsets to include the RD
-HoP now starts with full access to his departments (all Supply and Civil)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3587 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
ericgfwong@hotmail.com
2012-05-13 23:49:12 +00:00
parent 152eb3f29e
commit 43f93a06c5
5 changed files with 9458 additions and 9451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/defines/area/Space Station 13 areas.dm
View File

@@ -483,8 +483,8 @@ proc/process_ghost_teleport_locs()
//PRISON
/area/prison
name = "Prison Wing"
icon_state = "security"
name = "Prison Station"
icon_state = "brig"
/area/prison/arrival_airlock
name = "Prison Station Airlock"
@@ -976,6 +976,10 @@ proc/process_ghost_teleport_locs()
name = "Brig"
icon_state = "brig"
/area/security/prison
name = "Prison Wing"
icon_state = "security"
/area/security/warden
name = "Warden"
icon_state = "Warden"

10
code/game/gamemodes/events.dm
View File

@@ -292,18 +292,24 @@
//Changing this to affect the main station. Blame Urist. --Pete
/proc/prison_break() // -- Callagan
for (var/obj/machinery/power/apc/temp_apc in world)
if(istype(get_area(temp_apc), /area/security/prison))
temp_apc.overload_lighting()
if(istype(get_area(temp_apc), /area/security/brig))
temp_apc.overload_lighting()
// for (var/obj/machinery/computer/prison_shuttle/temp_shuttle in world)
// temp_shuttle.prison_break()
for (var/obj/structure/closet/secure_closet/security/temp_closet in world)
if(istype(get_area(temp_closet), /area/security/brig))
for (var/obj/structure/closet/secure_closet/brig/temp_closet in world)
if(istype(get_area(temp_closet), /area/security/prison))
temp_closet.locked = 0
temp_closet.icon_state = temp_closet.icon_closed
for (var/obj/machinery/door/airlock/security/temp_airlock in world)
if(istype(get_area(temp_airlock), /area/security/prison))
temp_airlock.prison_open()
if(istype(get_area(temp_airlock), /area/security/brig))
temp_airlock.prison_open()
for (var/obj/machinery/door/airlock/glass_security/temp_glassairlock in world)
if(istype(get_area(temp_glassairlock), /area/security/prison))
temp_glassairlock.prison_open()
if(istype(get_area(temp_glassairlock), /area/security/brig))
temp_glassairlock.prison_open()
for (var/obj/machinery/door_timer/temp_timer in world)

6
code/game/jobs/access.dm
View File

@@ -209,9 +209,9 @@
access_tox, access_tox_storage, access_chemistry, access_medical, access_genetics, access_engine,
access_emergency_storage, access_change_ids, access_ai_upload, access_eva, access_heads,
access_all_personal_lockers, access_tech_storage, access_maint_tunnels, access_bar, access_janitor,
access_crematorium, access_kitchen, access_robotics, access_cargo, access_cargo_bot, access_hydroponics, access_lawyer,
access_theatre, access_research, access_mining, access_heads_vault, access_mining_station,
access_hop, access_RC_announce, access_keycard_auth)
access_crematorium, access_kitchen, access_robotics, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer,
access_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station,
access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth)
if("Atmospheric Technician")
return list(access_atmospherics, access_maint_tunnels, access_emergency_storage)
if("Bartender")

4
code/game/jobs/job/medical.dm
View File

@@ -89,13 +89,13 @@
faction = "Station"
total_positions = 2
spawn_positions = 2
supervisors = "the chief medical officer"
supervisors = "the chief medical officer and research director"
selection_color = "#ffeef0"
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_if_possible(new /obj/item/device/radio/headset/headset_med(H), H.slot_ears)
H.equip_if_possible(new /obj/item/device/radio/headset/headset_medsci(H), H.slot_ears)
if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (H), H.slot_back)
if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back)
H.equip_if_possible(new /obj/item/clothing/under/rank/geneticist(H), H.slot_w_uniform)