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

[MIRROR] space cleanup (#10414)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-03-14 16:47:51 -07:00
committed by GitHub
parent 3ef8163aa0
commit 789db280cc
187 changed files with 3545 additions and 3547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/turbolift/turbolift_door_vr.dm
View File

@@ -1,5 +1,5 @@
// Vore specific code for /obj/machinery/door/airlock/lift
/obj/machinery/door/airlock/lift/emag_act(var/uses_left, var/mob/user)
to_chat(user, span_danger("This door is internally controlled."))
return 0 // Prevents the cryptographic sequencer from using a charge fruitlessly
to_chat(user, span_danger("This door is internally controlled."))
return 0 // Prevents the cryptographic sequencer from using a charge fruitlessly

10
code/modules/turbolift/turbolift_map.dm
View File

@@ -2,13 +2,13 @@
/obj/turbolift_map_holder
name = "turbolift map placeholder"
icon = 'icons/obj/turbolift_preview_3x3.dmi'
dir = SOUTH // Direction of the holder determines the placement of the lift control panel and doors.
var/depth = 1 // Number of floors to generate, including the initial floor.
dir = SOUTH // Direction of the holder determines the placement of the lift control panel and doors.
var/depth = 1 // Number of floors to generate, including the initial floor.
var/lift_size_x = 2 // Number of turfs on each axis to generate in addition to the first
var/lift_size_y = 2 // ie. a 3x3 lift would have a value of 2 in each of these variables.
// Various turf and door types used when generating the turbolift floors.
var/wall_type = /turf/simulated/wall/elevator
var/wall_type = /turf/simulated/wall/elevator
var/floor_type = /turf/simulated/floor/tiled/dark
var/door_type = /obj/machinery/door/airlock/lift
var/firedoor_type = /obj/machinery/door/firedoor/glass //CHOMP Edit for adding a firedoor to the exterior door
@@ -147,7 +147,7 @@
// Update path appropriately if needed.
var/swap_to = /turf/simulated/open
if(cz == uz) // Elevator.
if(cz == uz) // Elevator.
if(wall_type && (tx == ux || ty == uy || tx == ex || ty == ey) && !(tx >= door_x1 && tx <= door_x2 && ty >= door_y1 && ty <= door_y2)) //VOREStation edit: Wall-less elevator
swap_to = wall_type
else
@@ -198,7 +198,7 @@
panel_ext.set_dir(udir)
cfloor.ext_panel = panel_ext
// Place lights
// Place lights
var/turf/placing1 = locate(light_x1, light_y1, cz)
var/turf/placing2 = locate(light_x2, light_y2, cz)
var/obj/machinery/light/light1 = new(placing1, light)