shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mapping tweaks

Browse Source 
- moving over our CC level / maps
- moving over our levels
- all the other maps are moved to a seperate folder
- better comfy chairs
- brought back solar defence crates
This commit is contained in:
evilew
2024-11-22 01:58:57 +01:00
parent af3f43cd8f
commit 438dcff051
14 changed files with 183020 additions and 170304 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/beds_chairs/chair.dm
+36 -17
View File
@@ -14,6 +14,8 @@
var/buildstackamount = 1
var/item_chair = /obj/item/chair // if null it can't be picked up
layer = OBJ_LAYER
var/paddingcolor = "" //GS13 - better comfy chairs
var/mutable_appearance/lower
/obj/structure/chair/examine(mob/user)
. = ..()
@@ -26,6 +28,14 @@
if(!anchored) //why would you put these on the shuttle?
addtimer(CALLBACK(src, PROC_REF(RemoveFromLatejoin)), 0)
lower = GetLower() //if the chair has a lower part.
lower.layer = TABLE_LAYER
add_overlay(lower)
return ..()
/obj/structure/chair/proc/GetLower()
return mutable_appearance('GainStation13/icons/obj/chairs.dmi', "[icon_state]_lower") //GS13 - better chairs
/obj/structure/chair/ComponentInitialize()
. = ..()
AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE, CALLBACK(src, PROC_REF(can_user_rotate),CALLBACK(src), PROC_REF(can_be_rotated)),null)
@@ -183,21 +193,32 @@
/obj/structure/chair/comfy
name = "comfy chair"
desc = "It looks comfy."
icon = 'GainStation13/icons/obj/chairs.dmi' //GS13 - better sprites
icon_state = "comfychair"
color = rgb(255,255,255)
resistance_flags = FLAMMABLE
max_integrity = 70
buildstackamount = 2
item_chair = null
paddingcolor = "#e82d2d" //GS13 - better comfy chairs
var/mutable_appearance/armrest
var/mutable_appearance/padding
/obj/structure/chair/comfy/Initialize(mapload) //GS13 - better comfy chairs
padding = GetPadding()
padding.color = paddingcolor
if(paddingcolor)
add_overlay(padding)
/obj/structure/chair/comfy/Initialize(mapload)
armrest = GetArmrest()
armrest.layer = ABOVE_MOB_LAYER
return ..()
/obj/structure/chair/comfy/proc/GetArmrest()
return mutable_appearance('icons/obj/chairs.dmi', "comfychair_armrest")
return mutable_appearance('GainStation13/icons/obj/chairs.dmi', "comfychair_armrest") //GS13 - better comfy chairs
/obj/structure/chair/comfy/proc/GetPadding()
return mutable_appearance('GainStation13/icons/obj/chairs.dmi', "comfychair_padding") //GS13 - better comfy chairs
/obj/structure/chair/comfy/Destroy()
QDEL_NULL(armrest)
@@ -217,26 +238,23 @@
. = ..()
update_armrest()
/obj/structure/chair/comfy/brown
color = rgb(255,113,0)
/obj/structure/chair/comfy/brown //GS13 - better comfy chairs
paddingcolor = rgb(255,113,0)
/obj/structure/chair/comfy/beige
color = rgb(255,253,195)
/obj/structure/chair/comfy/beige //GS13 - better comfy chairs
paddingcolor = rgb(255,253,195)
/obj/structure/chair/comfy/teal
color = rgb(0,255,255)
/obj/structure/chair/comfy/teal //GS13 - better comfy chairs
paddingcolor = rgb(0,255,255)
/obj/structure/chair/comfy/black
color = rgb(167,164,153)
/obj/structure/chair/comfy/black //GS13 - better comfy chairs
paddingcolor = rgb(167,164,153)
/obj/structure/chair/comfy/green
color = rgb(81,173,106)
/obj/structure/chair/comfy/lime //GS13 - better comfy chairs
paddingcolor = rgb(255,251,0)
/obj/structure/chair/comfy/lime
color = rgb(255,251,0)
/obj/structure/chair/comfy/purple
color = rgb(255,50,230)
/obj/structure/chair/comfy/blue //GS13 - better comfy chairs
paddingcolor = rgb(125, 137, 218)
/obj/structure/chair/comfy/plywood
name = "plywood chair"
@@ -253,6 +271,7 @@
name = "shuttle seat"
desc = "A comfortable, secure seat. It has a more sturdy looking buckling system, for smoother flights."
icon_state = "shuttle_chair"
paddingcolor = "" //gs13 - padding appearance
/obj/structure/chair/comfy/shuttle/GetArmrest()
return mutable_appearance('icons/obj/chairs.dmi', "shuttle_chair_armrest")
code/game/objects/structures/signs/_signs.dm
+5 -4
View File
@@ -122,10 +122,11 @@
. = ..()
setDir(turn(dir, 90))
/obj/structure/sign/nanotrasen
name = "\improper Nanotrasen Logo"
desc = "A sign with the Nanotrasen Logo on it. Glory to Nanotrasen!"
icon_state = "nanotrasen"
/obj/structure/sign/nanotrasen //GS13 rebranded this whole thing, it's easier to just gato-ify it than replace every single instance of it on every map
name = "\improper GATO Logo"
desc = "A sign with the GATO Logo on it. Glory to GATO!"
icon = 'GainStation13/icons/obj/decals.dmi'
icon_state = "gato"
/obj/structure/sign/logo
name = "nanotrasen logo"