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

Ports musical instruments from /tg/

Browse Source
This commit is contained in:
Chompstation Bot
2021-06-01 20:29:51 +00:00
parent 151d317f5c
commit eb03a53185
182 changed files with 2552 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
code/modules/power/apc.dm
View File

@@ -189,9 +189,7 @@ GLOBAL_LIST_EMPTY(apcs)
pixel_x = (dir & 3)? 0 : (dir == 4 ? 26 : -26) //VOREStation Edit -> 24 to 26
pixel_y = (dir & 3)? (dir ==1 ? 26 : -26) : 0 //VOREStation Edit -> 24 to 26
if(building==0)
init()
else
if(building)
area = get_area(src)
area.apc = src
opened = 1
@@ -200,6 +198,16 @@ GLOBAL_LIST_EMPTY(apcs)
stat |= MAINT
update_icon()
/obj/machinery/power/apc/Initialize(mapload, ndir, building)
. = ..()
if(!building)
init()
return INITIALIZE_HINT_LATELOAD
/obj/machinery/power/apc/LateInitialize()
. = ..()
update()
/obj/machinery/power/apc/Destroy()
GLOB.apcs -= src
update()
@@ -268,9 +276,6 @@ GLOBAL_LIST_EMPTY(apcs)
make_terminal()
spawn(5)
update()
/obj/machinery/power/apc/examine(mob/user)
. = ..()
if(Adjacent(user))

12
code/modules/power/lighting.dm
View File

@@ -288,8 +288,8 @@ var/global/list/light_type_cache = list()
shows_alerts = FALSE //VOREStation Edit
var/lamp_shade = 1
/obj/machinery/light/flamp/New(atom/newloc, obj/machinery/light_construct/construct = null)
..(newloc, construct)
/obj/machinery/light/flamp/Initialize(mapload, obj/machinery/light_construct/construct = null)
. = ..()
if(construct)
start_with_cell = FALSE
lamp_shade = 0
@@ -322,15 +322,13 @@ var/global/list/light_type_cache = list()
auto_flicker = TRUE
//VOREStation Add - Shadeless!
/obj/machinery/light/flamp/noshade/New()
/obj/machinery/light/flamp/noshade
lamp_shade = 0
update(0)
..()
//VOREStation Add End
// create a new lighting fixture
/obj/machinery/light/New(atom/newloc, obj/machinery/light_construct/construct = null)
..(newloc)
/obj/machinery/light/Initialize(mapload, obj/machinery/light_construct/construct = null)
. =..()
if(start_with_cell && !no_emergency)
cell = new/obj/item/weapon/cell/emergency_light(src)