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

Merge pull request #7933 from VOREStation/Arokha/greyrail

Browse Source 
Add grey railing
This commit is contained in:
Aronai Sieyes
2020-05-17 22:39:01 -04:00
committed by GitHub
parent 0e678c167b f510ad68b1
commit 5b423cab8b
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
code/game/objects/structures/railing.dm
View File

@@ -1,7 +1,7 @@
// Based on railing.dmi from https://github.com/Endless-Horizon/CEV-Eris // Based on railing.dmi from https://github.com/Endless-Horizon/CEV-Eris
/obj/structure/railing /obj/structure/railing
name = "railing" name = "railing"
desc = "A standard steel railing. Play stupid games, win stupid prizes." desc = "A standard steel railing, painted orange. Play stupid games, win stupid prizes."
icon = 'icons/obj/railing.dmi' icon = 'icons/obj/railing.dmi'
density = 1 density = 1
throwpass = 1 throwpass = 1
@@ -14,6 +14,13 @@
var/health = 70 var/health = 70
var/maxhealth = 70 var/maxhealth = 70
var/check = 0 var/check = 0
var/icon_modifier = ""
/obj/structure/railing/grey
name = "grey railing"
desc = "A standard steel railing. Prevents stupid people from falling to their doom."
icon_modifier = "grey_"
icon_state = "grey_railing0"
/obj/structure/railing/New(loc, constructed = 0) /obj/structure/railing/New(loc, constructed = 0)
..() ..()
@@ -103,25 +110,25 @@
//layer = (dir == SOUTH) ? FLY_LAYER : initial(layer) // wtf does this even do //layer = (dir == SOUTH) ? FLY_LAYER : initial(layer) // wtf does this even do
overlays.Cut() overlays.Cut()
if (!check || !anchored)//|| !anchored if (!check || !anchored)//|| !anchored
icon_state = "railing0" icon_state = "[icon_modifier]railing0"
else else
icon_state = "railing1" icon_state = "[icon_modifier]railing1"
if (check & 32) if (check & 32)
overlays += image ('icons/obj/railing.dmi', src, "corneroverlay") overlays += image ('icons/obj/railing.dmi', src, "[icon_modifier]corneroverlay")
if ((check & 16) || !(check & 32) || (check & 64)) if ((check & 16) || !(check & 32) || (check & 64))
overlays += image ('icons/obj/railing.dmi', src, "frontoverlay_l") overlays += image ('icons/obj/railing.dmi', src, "[icon_modifier]frontoverlay_l")
if (!(check & 2) || (check & 1) || (check & 4)) if (!(check & 2) || (check & 1) || (check & 4))
overlays += image ('icons/obj/railing.dmi', src, "frontoverlay_r") overlays += image ('icons/obj/railing.dmi', src, "[icon_modifier]frontoverlay_r")
if(check & 4) if(check & 4)
switch (src.dir) switch (src.dir)
if (NORTH) if (NORTH)
overlays += image ('icons/obj/railing.dmi', src, "mcorneroverlay", pixel_x = 32) overlays += image ('icons/obj/railing.dmi', src, "[icon_modifier]mcorneroverlay", pixel_x = 32)
if (SOUTH) if (SOUTH)
overlays += image ('icons/obj/railing.dmi', src, "mcorneroverlay", pixel_x = -32) overlays += image ('icons/obj/railing.dmi', src, "[icon_modifier]mcorneroverlay", pixel_x = -32)
if (EAST) if (EAST)
overlays += image ('icons/obj/railing.dmi', src, "mcorneroverlay", pixel_y = -32) overlays += image ('icons/obj/railing.dmi', src, "[icon_modifier]mcorneroverlay", pixel_y = -32)
if (WEST) if (WEST)
overlays += image ('icons/obj/railing.dmi', src, "mcorneroverlay", pixel_y = 32) overlays += image ('icons/obj/railing.dmi', src, "[icon_modifier]mcorneroverlay", pixel_y = 32)
/obj/structure/railing/verb/rotate_counterclockwise() /obj/structure/railing/verb/rotate_counterclockwise()
set name = "Rotate Railing Counter-Clockwise" set name = "Rotate Railing Counter-Clockwise"

BIN
icons/obj/railing.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 815 B

After

Width:  |  Height:  |  Size: 3.9 KiB