cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-11 07:03:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Wallening 2: Return of the attack of the girders [MDB IGNORE][IDB IGNORE] (#30609)

Browse Source 
* WE HAVE LIFTOFF

* Reinforced wall + fixes

* (Reinforced) windows

* Adds nameless plasmaglass sprites

* Plasma windows

* Unnamed cult walls

* Add window edges back

* Wooden walls

* Plasma walls + THANK YOU CHAP

* Oops

* Wooden names

* Cult walls

* Plasma walls

* Uranium walls

* Golden walls

* Silver walls

* False wall basics

* All false walls

* Remove old walls

* Fixes

* First girders

* Build steps

* New floors and decalized floor tiles.

* satisfy linter

* Add command decals, remove old "blue tile" decal

* update script number

* have ATMs put their decals on last

* add engineering decals

* update spritesheets

* lots of tile coloring fixes

* more engi tile fixes

* more tile fixes

* linters

* fixes conflict?

* conflict fixes

* fix layering issue

* cult, necropolis, plastitanium, rocks, backrooms walls

* survival pod walls, prepare for titanium, plastitanium fwall fix

removes diagonal smoothing and the nodiagonal subtype from titanium walls as survival pod walls are a subtype of titanium

* linters

* linters again

* linters number 1 million and counting

* titanium walls

* brass walls, floors, windows

* titanium window, plastitanium window

* brass window smooths with wood and brass walls

* linters number 1 million and one

* all walls smooth with airlocks

in preparation for airlock sprites in a separate PR

* now all walls smooth with airlocks

* windows smooth with airlocks

* separate wallbumps, partially add apc

* tinted window

* survival pod windows

* oops i reverted apc.dm

* mapping fixes

* more mapping sprites

* more mapping stuff, fix my ungodly smooth rocks

* linters

* apc fix

* air alarm, apc, fire alarm offset preparations

* fire alarm implementation + rock fixes + firelock smoothing

* airlocks + supposed map fixes

* engi/atmos airlocks + overlays

* the rest of the doors lol

* linters + freezer fix

* fixes

* shuttle airlock + misc fixes

* firelocks

* fix

* oops

* i need to stop pushing fixes early

* shuttle airlock quickfix

* external airlocks + hatches + fixes

* centcom doors

* highsec airlocks

* vault airlock, double airlocks

* yaya deconflictsies

* lotsa fixes

* light fixes + blastdoor fixes

* firelock gap fix

* light construction fix + rcd fix

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <daan.lyklema@gmail.com>
Co-authored-by: Alexios <skillpointHD@Gmail.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
This commit is contained in:
Ahzpy
2026-04-22 07:49:30 -07:00
committed by GitHub
parent 0b39a004c3
commit 68fb77a19a
181 changed files with 1465 additions and 1383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/atmospherics/machinery/airalarm.dm
+8 -8
View File
@@ -63,7 +63,7 @@ GLOBAL_LIST_INIT(aalarm_modes, list(
/obj/machinery/alarm
name = "air alarm"
desc = "A wall-mounted device used to control atmospheric equipment. It looks a little cheaply made..."
icon = 'icons/obj/monitors.dmi'
icon = 'icons/obj/wallbumps/alarm.dmi'
icon_state = "alarm0"
anchored = TRUE
idle_power_consumption = 4
@@ -232,7 +232,7 @@ GLOBAL_LIST_INIT(aalarm_modes, list(
buildstage = AIR_ALARM_FRAME
wiresexposed = TRUE
set_pixel_offsets_from_dir(24, -24, 24, -24)
set_pixel_offsets_from_dir(32, -32, 32, -32)
GLOB.air_alarms += src
alarm_area.air_alarms += src
@@ -1221,12 +1221,12 @@ GLOBAL_LIST_INIT(aalarm_modes, list(
req_access = null
req_one_access = null
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/alarm, 24, 24)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/alarm/all_access, 24, 24)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/alarm/engine, 24, 24)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/alarm/monitor, 24, 24)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/alarm/server, 24, 24)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/alarm/syndicate, 24, 24)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/alarm, 32, 32)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/alarm/all_access, 32, 32)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/alarm/engine, 32, 32)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/alarm/monitor, 32, 32)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/alarm/server, 32, 32)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/alarm/syndicate, 32, 32)
/*
AIR ALARM CIRCUIT
code/modules/awaymissions/mission_code/ruins/sieged_lab.dm
-7
View File
@@ -154,13 +154,6 @@ GLOBAL_LIST_INIT(ruin_sieged_lab_research_loot, list(
/obj/item/paper/sieged_lab_research_paper
)
/obj/machinery/door/airlock/bloody
icon_state = "closed_bloody"
closed_icon_state = "closed_bloody"
opening_icon_state = "opening_bloody"
closing_icon_state = "closing_bloody"
airlock_material = "_" // sentinel value so we don't try adding fillers of any kind
/obj/effect/spawner/random/mine
name = "50pc landmine"
icon_state = "mine"
code/modules/mining/equipment/survival_pod.dm
+2 -1
View File
@@ -101,9 +101,10 @@
//Window
/obj/structure/window/full/shuttle/survival_pod
name = "pod window"
icon = 'icons/obj/smooth_structures/windows/pod_window.dmi'
icon = 'icons/obj/smooth_structures/windows/32x40pod_window.dmi'
icon_state = "pod_window-0"
base_icon_state = "pod_window"
edge_overlay_file = 'icons/obj/smooth_structures/windows/pod_window_edges.dmi'
smoothing_groups = list(SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_SURVIVAL_TIANIUM_POD)
canSmoothWith = list(SMOOTH_GROUP_SURVIVAL_TIANIUM_POD)
code/modules/mob/living/basic/hostile/demons/demon_powers.dm
+1 -1
View File
@@ -542,7 +542,7 @@
level_max = 0
base_cooldown = 0
var/static/list/upgrade_icons = list(
PD_UPGRADE_HIJACK_SPEED = image(icon = 'icons/obj/power.dmi', icon_state = "apcemag"),
PD_UPGRADE_HIJACK_SPEED = image(icon = 'icons/obj/wallbumps/apc.dmi', icon_state = "apcemag"),
PD_UPGRADE_DRAIN_SPEED = image(icon = 'icons/obj/power.dmi', icon_state = "ccharger"),
PD_UPGRADE_MAX_HEALTH = image(icon = 'icons/obj/stock_parts.dmi', icon_state = "bluespace_matter_bin"),
PD_UPGRADE_HEALTH_REGEN = image(icon = 'icons/obj/stock_parts.dmi', icon_state = "femto_mani"),
code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
+1 -1
View File
@@ -111,7 +111,7 @@ Difficulty: Hard
/datum/action/innate/megafauna_attack/hallucination_surround
name = "Surround Target"
button_icon = 'icons/turf/walls/wall.dmi'
button_icon = 'icons/turf/walls/32x40wall.dmi'
button_icon_state = "wall-0"
chosen_message = SPAN_COLOSSUS("You are now surrounding the target you click on with hallucinations.")
chosen_attack_num = 3
code/modules/power/apc/apc.dm
+15 -14
View File
@@ -10,6 +10,7 @@
/obj/machinery/power/apc
name = "area power controller"
desc = "A control terminal for the area electrical systems."
icon = 'icons/obj/wallbumps/apc.dmi'
icon_state = "apc0"
integrity_failure = 50
resistance_flags = FIRE_PROOF
@@ -176,9 +177,9 @@
name = "\improper [get_area_name(apc_area, TRUE)] APC"
if(building)
// Offset 24 pixels in direction of dir. This allows the APC to be embedded in a wall, yet still inside an area
// Offset 32 pixels in direction of dir. This allows the APC to be embedded in a wall, yet still inside an area
setDir(direction) // This is only used for pixel offsets, and later terminal placement. APC dir doesn't affect its sprite since it only has one orientation.
set_pixel_offsets_from_dir(24, -24, 24, -24)
set_pixel_offsets_from_dir(32, -32, 32, -32)
opened = APC_OPENED
operating = FALSE
@@ -1168,18 +1169,18 @@
/obj/machinery/power/apc/get_internal_wires()
return wires
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc, 24, 24)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/syndicate, 24, 24)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/syndicate/off, 24, 24)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/important, 24, 24)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/critical, 24, 24)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/off_station, 24, 24)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/off_station/empty_charge, 24, 24)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/worn_out, 24, 24)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/reinforced, 24, 24)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/reinforced/important, 24, 24)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/reinforced/critical, 24, 24)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/unbuilt, 24, 24)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc, 32, 32)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/syndicate, 32, 32)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/syndicate/off, 32, 32)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/important, 32, 32)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/critical, 32, 32)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/off_station, 32, 32)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/off_station/empty_charge, 32, 32)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/worn_out, 32, 32)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/reinforced, 32, 32)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/reinforced/important, 32, 32)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/reinforced/critical, 32, 32)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/unbuilt, 32, 32)
/obj/item/apc_electronics
code/modules/power/lights.dm
+59
View File
@@ -38,8 +38,37 @@
/obj/machinery/light_construct/Initialize(mapload, ndir, building)
. = ..()
switch(dir)
if(NORTH)
pixel_x = 0
pixel_y = 20
if(SOUTH)
pixel_x = 0
pixel_y = 0
if(EAST)
pixel_x = 8
pixel_y = 4
if(WEST)
pixel_x = -8
pixel_y = 4
update_icon(UPDATE_ICON_STATE)
/obj/machinery/light_construct/setDir(newdir)
. = ..()
switch(dir)
if(NORTH)
pixel_x = 0
pixel_y = 20
if(SOUTH)
pixel_x = 0
pixel_y = 0
if(EAST)
pixel_x = 8
pixel_y = 4
if(WEST)
pixel_x = -8
pixel_y = 4
/obj/machinery/light_construct/examine(mob/user)
. = ..()
if(get_dist(user, src) <= 2)
@@ -379,6 +408,20 @@
if(A && !A.requires_power)
on = TRUE
switch(dir)
if(NORTH)
pixel_x = 0
pixel_y = 20
if(SOUTH)
pixel_x = 0
pixel_y = 0
if(EAST)
pixel_x = 8
pixel_y = 4
if(WEST)
pixel_x = -8
pixel_y = 4
switch(base_state)
if("tube")
brightness_range = 8
@@ -1000,6 +1043,22 @@
AddElement(/datum/element/connect_loc, loc_connections)
update()
/obj/machinery/light/setDir(newdir)
. = ..()
switch(dir)
if(NORTH)
pixel_x = 0
pixel_y = 20
if(SOUTH)
pixel_x = 0
pixel_y = 0
if(EAST)
pixel_x = 8
pixel_y = 4
if(WEST)
pixel_x = -8
pixel_y = 4
/obj/item/light/proc/on_atom_entered(datum/source, atom/movable/entered)
var/mob/living/living_entered = entered
if(istype(living_entered) && has_gravity(loc))