cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 16:18:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MDB IGNORE] You can have your cake and eat it too. Remake of #66406 (Splitting up areas.dmi + code related stuff) (#66726)

Browse Source 
Areas.dmi right now houses all of our mapped turfs icons (which is roughly 400 icons). Not an issue, but it's incredibly large and clunky to navigate right now. This isn't an issue for the average coder and/or player code diving, but it is for mappers wanting to add new turfs. Currently, the file has some organization, but its still an overall mess. This PR aims to slice the behemoth with multiple .dmi files corresponding to specific areas.

I also plan to repath /area/* -> /area/station/* for station turf only. This is to clean it up, as most other turfs follow this format (that being /area/turf_zone/*).

I'm also writing an update paths file as I go along.
This commit is contained in:
Jolly
2022-05-06 12:09:53 -06:00
committed by GitHub
parent eba1c0f594
commit b4fb8f3ed1
117 changed files with 44563 additions and 44255 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species_types/vampire.dm
+1 -1
View File
@@ -64,7 +64,7 @@
holder.shape.dust() //vampires do not have batform anymore, but this would still lead to very weird stuff with other shapeshift holders
vampire.dust()
var/area/A = get_area(vampire)
if(istype(A, /area/service/chapel))
if(istype(A, /area/station/service/chapel))
to_chat(vampire, span_warning("You don't belong here!"))
vampire.adjustFireLoss(10 * delta_time)
vampire.adjust_fire_stacks(3 * delta_time)
code/modules/mob/living/silicon/ai/multicam.dm
+1
View File
@@ -90,6 +90,7 @@
/area/ai_multicam_room
name = "ai_multicam_room"
icon = 'icons/area/areas_centcom.dmi'
icon_state = "ai_camera_room"
static_lighting = FALSE
code/modules/mob/living/simple_animal/bot/floorbot.dm
+1 -1
View File
@@ -375,7 +375,7 @@
F.broken = FALSE
F.burnt = FALSE
F.icon_state = initial(F.icon_state)
else if(istype(is_this_maints, /area/maintenance)) //place catwalk if it's plating and we're in maints
else if(istype(is_this_maints, /area/station/maintenance)) //place catwalk if it's plating and we're in maints
F.PlaceOnTop(/turf/open/floor/catwalk_floor, flags = CHANGETURF_INHERIT_AIR)
else //place normal tile if it's plating anywhere else
F = F.make_plating(TRUE) || F
code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
+2 -2
View File
@@ -100,9 +100,9 @@
"<span class='warning'><u>If you do not have the regular drone laws, follow your laws to the best of your ability.</u></span>\n"+\
"<span class='notice'>Prefix your message with :b to speak in Drone Chat.</span>\n"
/// blacklisted drone areas, direct
var/list/drone_area_blacklist_flat = list(/area/engineering/atmos, /area/engineering/atmospherics_engine)
var/list/drone_area_blacklist_flat = list(/area/station/engineering/atmos, /area/station/engineering/atmospherics_engine)
/// blacklisted drone areas, recursive/includes descendants
var/list/drone_area_blacklist_recursive = list(/area/engineering/supermatter)
var/list/drone_area_blacklist_recursive = list(/area/station/engineering/supermatter)
/// blacklisted drone machines, direct
var/list/drone_machinery_blacklist_flat
/// blacklisted drone machines, recursive/includes descendants