cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 13:13:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #1079, airlock permissions for the prison wing and QM's office.

Browse Source
This commit is contained in:
Albert Iordache
2012-05-17 13:40:22 +03:00
parent d23513a047
commit c93bb9f245
4 changed files with 49 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
code/defines/obj/machinery.dm
View File

@@ -225,38 +225,6 @@
idle_power_usage = 10
active_power_usage = 400
/obj/machinery/door_control
name = "remote door-control"
desc = "It controls doors, remotely."
icon = 'stationobjs.dmi'
icon_state = "doorctrl0"
desc = "A remote control-switch for a door."
var/id = null
var/range = 10
var/normaldoorcontrol = 0
var/desiredstate = 0 // Zero is closed, 1 is open.
var/specialfunctions = 1
/*
Bitflag, 1= open
2= idscan,
4= bolts
8= shock
16= door safties
*/
var/exposedwires = 0
var/wires = 3
/*
Bitflag, 1=checkID
2=Network Access
*/
anchored = 1.0
use_power = 1
idle_power_usage = 2
active_power_usage = 4
/obj/machinery/driver_button
name = "mass driver button"
icon = 'objects.dmi'

32
code/game/machinery/door_control.dm
View File

@@ -1,3 +1,35 @@
/obj/machinery/door_control
name = "remote door-control"
desc = "It controls doors, remotely."
icon = 'stationobjs.dmi'
icon_state = "doorctrl0"
desc = "A remote control-switch for a door."
var/id = null
var/range = 10
var/normaldoorcontrol = 0
var/desiredstate = 0 // Zero is closed, 1 is open.
var/specialfunctions = 1
/*
Bitflag, 1= open
2= idscan,
4= bolts
8= shock
16= door safties
*/
var/exposedwires = 0
var/wires = 3
/*
Bitflag, 1=checkID
2=Network Access
*/
anchored = 1.0
use_power = 1
idle_power_usage = 2
active_power_usage = 4
/obj/machinery/door_control/attack_ai(mob/user as mob)
if(wires & 2)
return src.attack_hand(user)

13
html/changelog.html
View File

@@ -47,6 +47,19 @@ Stuff which is in development and not yet visible to players or just code relate
should be listed in the changelog upon commit though. Thanks. -->
<!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
<div class="commit sansserif">
<h2 class="date">17 May 2012</h2>
<h3 class="author">Abi79 updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Fixed ID access requirements for the QM's office and the prison wing.</li>
</ul>
<h3 class="author">SkyMarshal updated:</h3>
<ul class="changes bgimages16">
<li class="tweak">Metal foam now blocks air.</li>
</ul>
</div>
<div class="commit sansserif">
<h2 class="date">16 May 2012</h2>
<h3 class="author">Erthilo updated:</h3>

8
maps/tgstation.2.0.8.dmm
View File

@@ -667,8 +667,8 @@
"amQ" = (/obj/structure/stool/bed,/turf/simulated/floor{icon_state = "floorgrime"},/area/prison)
"amR" = (/obj/structure/stool/bed,/obj/item/toy/snappop,/obj/item/weapon/bedsheet/orange,/turf/simulated/floor,/area/prison)
"amS" = (/turf/simulated/floor{icon_state = "red"; dir = 4},/area/prison)
"amT" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Prison Gate"; name = "Prison Blast Door"; opacity = 0},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass/glass_security{id_tag = "permbrig2"; name = "Prison Wing Interior"; req_access_txt = "0"},/turf/simulated/floor{icon_state = "red"; dir = 8},/area/prison)
"amU" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass/glass_security{id_tag = "permbrig"; name = "Prison Wing Exterior"; req_access_txt = "0"},/turf/simulated/floor{icon_state = "red"; dir = 8},/area/prison)
"amT" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Prison Gate"; name = "Prison Blast Door"; opacity = 0},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass/glass_security{id_tag = "permbrig2"; name = "Prison Wing Interior"; req_access_txt = "1"},/turf/simulated/floor{icon_state = "red"; dir = 8},/area/prison)
"amU" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Prison Gate"; name = "Prison Blast Door"; opacity = 0},/obj/machinery/door/airlock/glass/glass_security{id_tag = "permbrig"; name = "Prison Wing Exterior"; req_access_txt = "1"},/turf/simulated/floor{icon_state = "red"; dir = 8},/area/prison)
"amV" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/prison)
"amW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor{icon_state = "red"; dir = 4},/area/prison)
"amX" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/prison)
@@ -728,7 +728,7 @@
"anZ" = (/obj/machinery/vending/cola,/turf/simulated/floor{icon_state = "redcorner"; dir = 4},/area/prison)
"aoa" = (/obj/machinery/flasher{dir = 4; id = "permflash"; pixel_x = -24; pixel_y = 0},/turf/simulated/floor{icon_state = "red"; dir = 1},/area/prison)
"aob" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor{icon_state = "red"; dir = 1},/area/prison)
"aoc" = (/obj/machinery/door_control{desc = "A remote control-switch for the exterior doors."; id = "permbrig"; name = "Prison Exterior Airlock Control"; normaldoorcontrol = 1; pixel_x = -24; pixel_y = 6},/obj/machinery/door_control{desc = "A remote control-switch for the interior doors."; id = "permbrig2"; name = "Prison Interior Airlock Control"; normaldoorcontrol = 1; pixel_x = -24; pixel_y = -6},/turf/simulated/floor{dir = 8; icon_state = "redcorner"},/area/prison)
"aoc" = (/turf/simulated/floor{dir = 8; icon_state = "redcorner"},/area/prison)
"aod" = (/obj/structure/closet/extinguisher{pixel_x = 27; pixel_y = 0},/turf/simulated/floor{icon_state = "red"; dir = 4},/area/prison)
"aoe" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/security/brig)
"aof" = (/obj/machinery/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor{icon_state = "white"},/area/security/brig)
@@ -3953,7 +3953,7 @@
"bya" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/apmaint)
"byb" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/apmaint)
"byc" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/apmaint)
"byd" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/machinery/door/airlock/maintenance{name = "QM Office Maintenance"; req_combined_access_txt = "12;41"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/quartermaster/qm)
"byd" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/machinery/door/airlock/maintenance{name = "QM Office Maintenance"; req_access_txt = "41"; req_combined_access_txt = "0"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/quartermaster/qm)
"bye" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/quartermaster/qm)
"byf" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/quartermaster/qm)
"byg" = (/obj/structure/disposalpipe/sortjunction{dir = 8; icon_state = "pipe-j1s"; sortType = list("QM Office")},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/quartermaster/qm)