cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 02:24:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Expanded cyberiad permabrig (#18272)

Browse Source 
* prisoner rights are cool

* pass 2

* prisoner-witnessed killings

* improvements 3, wire mods

* pass 4

* i accidentally turned this sofa red, revert

* feedback pass

* deconflict

* scrubbers!

* purges tom

* minor tweaks

* merge conflict pt2

* bmon review

* tweaks

* holopads!

* lockdown completeness

* shuttle seat

* rwalls? why?

* return of the pyjama

* more tweaks

* lizard

* bmon review

* TOILETS
This commit is contained in:
S34N
2022-07-17 23:31:59 +01:00
committed by GitHub
parent aea846c761
commit cebd76bdcb
2 changed files with 4764 additions and 3082 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/cyberiad/cyberiad.dmm
+4756 -3080
View File
File diff suppressed because it is too large Load Diff
code/modules/power/cable.dm
+8 -2
View File
@@ -35,10 +35,13 @@ By design, d1 is the smallest direction and d2 is the highest
icon_state = "0-1"
var/d1 = 0
var/d2 = 1
plane = FLOOR_PLANE
layer = WIRE_LAYER //Just below unary stuff, which is at 2.45 and above pipes, which are at 2.4
color = COLOR_RED
//The following vars are set here for the benefit of mapping - they are reset when the cable is spawned
alpha = 128 //is set to 255 when spawned
plane = GAME_PLANE //is set to FLOOR_PLANE when spawned
layer = LOW_OBJ_LAYER //isset to WIRE_LAYER when spawned
/obj/structure/cable/yellow
color = COLOR_YELLOW
@@ -62,6 +65,9 @@ By design, d1 is the smallest direction and d2 is the highest
/obj/structure/cable/Initialize(mapload)
. = ..()
plane = FLOOR_PLANE //move it down so ambient occlusion ignores it
alpha = 255 //make it not semi-transparent
layer = WIRE_LAYER //put it on the right level
// ensure d1 & d2 reflect the icon_state for entering and exiting cable
var/dash = findtext(icon_state, "-")