Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Hydro lights removal UNUSED! #6803

Merged
merged 8 commits into from
Jul 29, 2024
Merged

Hydro lights removal UNUSED! #6803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9676fa0
eh
uuuuhuuuu Jul 13, 2024
a184b87
Merge branch 'master' of https://github.com/cuberound/cmss13
uuuuhuuuu Jul 13, 2024
444b74c
ehm
uuuuhuuuu Jul 16, 2024
98fa1ae
Merge branch 'master' of https://github.com/cuberound/cmss13
uuuuhuuuu Jul 16, 2024
2a78285
ehm
uuuuhuuuu Jul 16, 2024
b412fdb
Merge branch 'cmss13-devs:master' into master
cuberound Jul 18, 2024
8218d2d
replaces hydro lights with colony lights
uuuuhuuuu Jul 26, 2024
e420ca3
eh
uuuuhuuuu Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
169 changes: 0 additions & 169 deletions code/game/machinery/bio-dome_floodlights.dm
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions code/modules/vehicles/multitile/multitile_bump.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,14 +437,6 @@
qdel(src)
return TRUE

/obj/structure/machinery/hydro_floodlight/handle_vehicle_bump(obj/vehicle/multitile/V)
if(V.vehicle_flags & VEHICLE_CLASS_WEAK)
return FALSE
playsound(V, 'sound/effects/metal_crash.ogg', 20)
visible_message(SPAN_DANGER("\The [V] crushes \the [src]!"))
qdel(src)
return TRUE

/obj/structure/machinery/floodlight/handle_vehicle_bump(obj/vehicle/multitile/V)
if(V.vehicle_flags & VEHICLE_CLASS_WEAK)
return FALSE
Expand Down
1 change: 0 additions & 1 deletion colonialmarines.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,6 @@
#include "code\game\machinery\autolathe.dm"
#include "code\game\machinery\autolathe_datums.dm"
#include "code\game\machinery\Beacon.dm"
#include "code\game\machinery\bio-dome_floodlights.dm"
#include "code\game\machinery\biohazard_lockdown.dm"
#include "code\game\machinery\bioprinter.dm"
#include "code\game\machinery\buttons.dm"
Expand Down
2 changes: 1 addition & 1 deletion maps/templates/baseone.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@
/turf/open/floor/almayer/blue/north,
/area/adminlevel/bunker01/hydroponics)
"bD" = (
/obj/structure/machinery/hydro_floodlight,
/obj/structure/machinery/colony_floodlight,
/turf/open/floor/almayer/blue/northeast,
/area/adminlevel/bunker01/hydroponics)
"bE" = (
Expand Down
2 changes: 1 addition & 1 deletion maps/templates/basetwo.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,7 +896,7 @@
/turf/open/floor/almayer/blue/north,
/area/adminlevel/bunker01/hydroponics)
"df" = (
/obj/structure/machinery/hydro_floodlight,
/obj/structure/machinery/colony_floodlight,
/turf/open/floor/almayer/blue/northeast,
/area/adminlevel/bunker01/hydroponics)
"dg" = (
Expand Down
Loading