cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-29 15:08:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3956 from Jakksergal/master

Browse Source 
Security Overhaul
This commit is contained in:
Spades
2018-07-02 20:49:11 -04:00
committed by GitHub
parent c9282c05a9 035e762cf3
commit 1528dd37fc
8 changed files with 22862 additions and 18953 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/turfs/flooring/flooring_decals_vr.dm
+88 -1
View File
@@ -10,4 +10,91 @@
/obj/effect/floor_decal/industrial/outline/red
name = "red outline"
color = COLOR_RED
color = COLOR_RED
/obj/effect/floor_decal/borderfloor/shifted
icon_state = "borderfloor_shifted"
/obj/effect/floor_decal/borderfloorblack/shifted
icon_state = "borderfloor_shifted"
/obj/effect/floor_decal/borderfloorwhite/shifted
icon_state = "borderfloor_shifted"
/obj/effect/floor_decal/corner/beige/border/shifted
icon_state = "bordercolor_shifted"
/obj/effect/floor_decal/corner/black/border/shifted
icon_state = "bordercolor_shifted"
/obj/effect/floor_decal/corner/blue/border/shifted
icon_state = "bordercolor_shifted"
/obj/effect/floor_decal/corner/brown/border/shifted
icon_state = "bordercolor_shifted"
/obj/effect/floor_decal/corner/green/border/shifted
icon_state = "bordercolor_shifted"
/obj/effect/floor_decal/corner/grey/border/shifted
icon_state = "bordercolor_shifted"
/obj/effect/floor_decal/corner/lightgrey/border/shifted
icon_state = "bordercolor_shifted"
/obj/effect/floor_decal/corner/lightorange
name = "orange corner"
color = "#ed983d"
/obj/effect/floor_decal/corner/lightorange/diagonal
icon_state = "corner_white_diagonal"
/obj/effect/floor_decal/corner/lightorange/full
icon_state = "corner_white_full"
/obj/effect/floor_decal/corner/lightorange/three_quarters
icon_state = "corner_white_three_quarters"
/obj/effect/floor_decal/corner/lightorange/border
icon_state = "bordercolor"
/obj/effect/floor_decal/corner/lightorange/border/shifted
icon_state = "bordercolor_shifted"
/obj/effect/floor_decal/corner/lightorange/bordercorner
icon_state = "bordercolorcorner"
/obj/effect/floor_decal/corner/lightorange/bordercorner2
icon_state = "bordercolorcorner2"
/obj/effect/floor_decal/corner/lightorange/borderfull
icon_state = "bordercolorfull"
/obj/effect/floor_decal/corner/lightorange/bordercee
icon_state = "bordercolorcee"
/obj/effect/floor_decal/corner/lime/border/shifted
icon_state = "bordercolor_shifted"
/obj/effect/floor_decal/corner/mauve/border/shifted
icon_state = "bordercolor_shifted"
/obj/effect/floor_decal/corner/orange/border/shifted
icon_state = "bordercolor_shifted"
/obj/effect/floor_decal/corner/paleblue/border/shifted
icon_state = "bordercolor_shifted"
/obj/effect/floor_decal/corner/pink/border/shifted
icon_state = "bordercolor_shifted"
/obj/effect/floor_decal/corner/purple/border/shifted
icon_state = "bordercolor_shifted"
/obj/effect/floor_decal/corner/red/border/shifted
icon_state = "bordercolor_shifted"
/obj/effect/floor_decal/corner/white/border/shifted
icon_state = "bordercolor_shifted"
/obj/effect/floor_decal/corner/yellow/border/shifted
icon_state = "bordercolor_shifted"
icons/turf/flooring/decals_vr.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 93 KiB

After

Width:  |  Height:  |  Size: 95 KiB

maps/tether/tether-05-station1.dmm
+39 -27
View File
@@ -4018,13 +4018,6 @@
/turf/simulated/wall/r_wall,
/area/engineering/engine_monitoring)
"alG" = (
/obj/structure/cable/green{
d2 = 8;
icon_state = "0-8"
},
/obj/structure/cable/green{
icon_state = "16-0"
},
/turf/simulated/floor,
/area/engineering/shaft)
"alH" = (
@@ -4040,16 +4033,12 @@
/turf/simulated/floor/tiled,
/area/engineering/engineering_monitoring)
"alK" = (
/obj/structure/ladder/up,
/obj/structure/cable/green{
d1 = 2;
d2 = 4;
icon_state = "2-4"
d2 = 8;
icon_state = "2-8"
},
/obj/structure/ladder/up,
/obj/structure/railing{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor,
/area/engineering/shaft)
"alN" = (
@@ -4443,17 +4432,11 @@
/turf/simulated/floor/tiled,
/area/engineering/engineering_monitoring)
"anc" = (
/obj/structure/railing{
dir = 1
},
/obj/machinery/alarm{
dir = 8;
pixel_x = 25;
pixel_y = 0
},
/obj/machinery/light/small{
dir = 4
},
/turf/simulated/floor,
/area/engineering/shaft)
"and" = (
@@ -21658,6 +21641,10 @@
},
/turf/simulated/floor/tiled,
/area/tether/station/explorer_meeting)
"hPi" = (
/obj/machinery/light/small,
/turf/simulated/floor,
/area/engineering/shaft)
"ibX" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
@@ -21989,6 +21976,17 @@
},
/turf/simulated/floor/tiled,
/area/tether/station/explorer_meeting)
"nov" = (
/obj/structure/railing,
/obj/structure/table/rack{
dir = 8;
layer = 2.9
},
/obj/random/maintenance/engineering,
/obj/random/maintenance/engineering,
/obj/random/tech_supply,
/turf/simulated/floor,
/area/engineering/shaft)
"nxL" = (
/obj/effect/floor_decal/steeldecal/steel_decals6{
dir = 10
@@ -22650,6 +22648,20 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel_grid,
/area/tether/station/excursion_dock)
"xMk" = (
/obj/structure/cable/green{
icon_state = "16-0"
},
/obj/structure/cable/green{
d2 = 4;
icon_state = "0-4"
},
/obj/structure/railing{
dir = 4
},
/obj/structure/railing,
/turf/simulated/floor,
/area/engineering/shaft)
"ygn" = (
/turf/simulated/floor/tiled,
/area/tether/station/pathfinder_office)
@@ -28096,8 +28108,8 @@ acJ
acJ
ajp
aac
aac
aac
arq
arq
abZ
abZ
aps
@@ -28238,9 +28250,9 @@ acJ
acJ
agJ
aac
aac
aac
aac
arq
nov
alG
acz
apw
aql
@@ -28381,8 +28393,8 @@ acJ
agJ
aac
arq
arq
arq
xMk
hPi
acz
apv
aqk
maps/tether/tether-06-station2.dmm
+4435 -4028
View File
File diff suppressed because it is too large Load Diff
maps/tether/tether-07-station3.dmm
+18280 -14890
View File
File diff suppressed because it is too large Load Diff
maps/tether/tether_areas.dm
+5 -1
View File
@@ -89,4 +89,8 @@
/area/engineering/shaft
name = "\improper Engineering Electrical Shaft"
icon_state = "substation"
icon_state = "substation"
/area/vacant/vacant_office
name = "\improper Vacant Office"
icon_state = "vacant_site"
maps/tether/tether_areas2.dm
+13 -4
View File
@@ -167,7 +167,7 @@
/area/tether/surfacebase/security/common
name = "\improper Surface Security Room"
/area/tether/surfacebase/security/armory
name = "\improper Surface Armoary"
name = "\improper Surface Armory"
/area/tether/surfacebase/security/checkpoint
name = "\improper Surface Checkpoint Office"
/area/tether/surfacebase/security/hallway
@@ -360,6 +360,9 @@
/area/security/hallway
name = "\improper Security Hallway"
icon_state = "security"
/area/security/hallwayaux
name = "\improper Security Armory Hallway"
icon_state = "security"
/area/security/forensics
name = "\improper Forensics Lab"
icon_state = "security"
@@ -372,15 +375,21 @@
/area/security/brig/bathroom
name = "\improper Brig Bathroom"
icon_state = "security"
/area/security/armory/green
name = "\improper Armory - Green"
icon_state = "security_equip_storage"
/area/security/armory/blue
name = "\improper Armory - Blue"
icon_state = "armory"
/area/security/armory/red
name = "\improper Armory - Red"
icon_state = "red2"
/area/security/observation
name = "\improper Brig Observation"
icon_state = "riot_control"
/area/security/eva
name = "\improper Security EVA"
icon_state = "security_equip_storage"
/area/security/recstorage
name = "\improper Brig Recreation Storage"
icon_state = "brig"
/area/engineering/atmos/backup
name = "\improper Backup Atmospherics"
maps/tether/tether_things.dm
+2 -2
View File
@@ -378,11 +378,11 @@ var/global/list/latejoin_tram = list()
reagents.add_reagent("paracetamol", 5)
//"Red" Armory Door
/obj/machinery/door/airlock/multi_tile/metal/red
/obj/machinery/door/airlock/security/armory
name = "Red Armory"
//color = ""
/obj/machinery/door/airlock/multi_tile/metal/red/allowed(mob/user)
/obj/machinery/door/airlock/security/armory/allowed(mob/user)
if(get_security_level() in list("green","blue"))
return FALSE