mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 21:18:37 +01:00
WaterpigandGitHub
ea02989f38
## About The Pull Request "I'm going to extend my break" - Me, 2 days ago "Hey I should start cleaning up the Skyrat modular folder" - Me, Today I yet again fall victim to my own hubris Left out some BUBBER TODOs, feel free to do these if you find them manageable ## Why It's Good For The Game We made some old mistakes with some edits (Like commenting out ruins instead of making them unpickable for the ruin system) (This I fixed, admins can now bus them in!) We also made a lot of edits to Skyrat code, a lot of which can be cleanly merged into their code now ## Proof Of Testing If it compiles, it works. Unlike my modularization PR from a year ago this is less fuckupable ## Changelog N/A, not player facing
95 lines
2.6 KiB
Plaintext
95 lines
2.6 KiB
Plaintext
/obj/effect/turf_decal/skyrat_decals
|
|
icon = 'modular_skyrat/modules/mapping/icons/turf/turf_decals.dmi'
|
|
icon_state = "bad_coder"
|
|
|
|
/obj/effect/decal/fakelattice/passthru //Why the hell did TG make it dense anyways
|
|
density = FALSE
|
|
|
|
//BUBBER EDIT START - FIX CHECKS // BUBBER TODO - Look into if this is the right way to do it
|
|
/obj/effect/decal/fakelattice/NeverShouldHaveComeHere(turf/here_turf)
|
|
return !islava(here_turf) && ..()
|
|
//BUBBER EDIT END
|
|
|
|
/obj/effect/decal/fakelattice/passthru/NeverShouldHaveComeHere(turf/here_turf)
|
|
return !isclosedturf(here_turf) && ..()
|
|
|
|
///SYNDICATE EMBLEM///
|
|
//Bottom
|
|
/obj/effect/turf_decal/skyrat_decals/syndicate/bottom/left
|
|
icon_state = "1,1"
|
|
|
|
/obj/effect/turf_decal/skyrat_decals/syndicate/bottom/middle
|
|
icon_state = "1,2"
|
|
|
|
/obj/effect/turf_decal/skyrat_decals/syndicate/bottom/right
|
|
icon_state = "1,3"
|
|
//Middle
|
|
/obj/effect/turf_decal/skyrat_decals/syndicate/middle/left
|
|
icon_state = "2,1"
|
|
|
|
/obj/effect/turf_decal/skyrat_decals/syndicate/middle/middle
|
|
icon_state = "2,2"
|
|
|
|
/obj/effect/turf_decal/skyrat_decals/syndicate/middle/right
|
|
icon_state = "2,3"
|
|
//Top
|
|
/obj/effect/turf_decal/skyrat_decals/syndicate/top/left
|
|
icon_state = "3,1"
|
|
|
|
/obj/effect/turf_decal/skyrat_decals/syndicate/top/middle
|
|
icon_state = "3,2"
|
|
|
|
/obj/effect/turf_decal/skyrat_decals/syndicate/top/right
|
|
icon_state = "3,3"
|
|
|
|
///ENCLAVE EMBLEM///
|
|
/obj/effect/turf_decal/skyrat_decals/enclave
|
|
layer = TURF_PLATING_DECAL_LAYER
|
|
alpha = 110
|
|
color = "#A46106"
|
|
//Bottom
|
|
/obj/effect/turf_decal/skyrat_decals/enclave/bottom/left
|
|
icon_state = "e1,1"
|
|
|
|
/obj/effect/turf_decal/skyrat_decals/enclave/bottom/middle
|
|
icon_state = "e1,2"
|
|
|
|
/obj/effect/turf_decal/skyrat_decals/enclave/bottom/right
|
|
icon_state = "e1,3"
|
|
//Middle
|
|
/obj/effect/turf_decal/skyrat_decals/enclave/middle/left
|
|
icon_state = "e2,1"
|
|
|
|
/obj/effect/turf_decal/skyrat_decals/enclave/middle/middle
|
|
icon_state = "e2,2"
|
|
|
|
/obj/effect/turf_decal/skyrat_decals/enclave/middle/right
|
|
icon_state = "e2,3"
|
|
//Top
|
|
/obj/effect/turf_decal/skyrat_decals/enclave/top/left
|
|
icon_state = "e3,1"
|
|
|
|
/obj/effect/turf_decal/skyrat_decals/enclave/top/middle
|
|
icon_state = "e3,2"
|
|
|
|
/obj/effect/turf_decal/skyrat_decals/enclave/top/right
|
|
icon_state = "e3,3"
|
|
|
|
///Departments///
|
|
/obj/effect/turf_decal/skyrat_decals/departments/bridge
|
|
icon_state = "bridge"
|
|
|
|
///DS-2 Sign///
|
|
/obj/effect/turf_decal/skyrat_decals/ds2/left
|
|
icon_state = "ds1"
|
|
|
|
/obj/effect/turf_decal/skyrat_decals/ds2/middle
|
|
icon_state = "ds2"
|
|
|
|
/obj/effect/turf_decal/skyrat_decals/ds2/right
|
|
icon_state = "ds3"
|
|
|
|
///Misc///
|
|
/obj/effect/turf_decal/skyrat_decals/misc/handicapped
|
|
icon_state = "handicapped"
|