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

Refactors station areas to be /area/station subtypes (#21681)

Browse Source 
* areas

* progress...

* death hatred and murder

* get current master maps

* hoooly shit i can load up the maps

* it compiles now

* map changes

* fixes some unintended stuff

* make the .dme right

* fix mixed space+tab indents

* more space-tab fixes

* CI, please show me more than 1 CI fail at a time

* UPDATE PATHS!!!

* none of the stations had it anyways, but fixed

* mint wasnt actually deleted, my bad

* epic random CI fail for no reason

* i beg you, CI

* dont delete anything

* okay THAT should work now

* okay get master maps and rerun

* okay THEN run update paths

* actually done now

* oops
This commit is contained in:
Contrabang
2023-09-06 12:37:50 -04:00
committed by GitHub
parent 07e0b4fc97
commit 65ab4a5d89
52 changed files with 39284 additions and 39352 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/spell_handler/vampire.dm
+1 -1
View File
@@ -25,7 +25,7 @@
to_chat(user, "<span class='warning'>You require at least [required_blood] units of usable blood to do that!</span>")
return FALSE
//chapel check
if(istype(get_area(user), /area/chapel) && !fullpower)
if(istype(get_area(user), /area/station/service/chapel) && !fullpower)
if(show_message)
to_chat(user, "<span class='warning'>Your powers are useless on this holy ground.</span>")
return FALSE
code/datums/weather/weather_types/radiation_storm.dm
+11 -3
View File
@@ -17,9 +17,17 @@
end_message = "<span class='notice'>The air seems to be cooling off again.</span>"
var/pre_maint_all_access
area_type = /area
protected_areas = list(/area/maintenance, /area/turret_protected/ai_upload, /area/turret_protected/ai_upload_foyer,
/area/turret_protected/ai, /area/storage/emergency, /area/storage/emergency2, /area/crew_quarters/sleep, /area/security/brig,
/area/shuttle, /area/survivalpod) //although survivalpods are off-station, creating one on station no longer protects pods on station from the rad storm
protected_areas = list(
/area/station/maintenance,
/area/station/turret_protected/ai_upload,
/area/station/turret_protected/ai,
/area/station/public/storage/emergency,
/area/station/public/storage/emergency/port,
/area/station/public/sleep,
/area/station/security/brig,
/area/shuttle,
/area/survivalpod //although survivalpods are off-station, creating one on station no longer protects pods on station from the rad storm
)
target_trait = STATION_LEVEL
immunity_type = "rad"
code/datums/weather/weather_types/solar_flare.dm
+3 -3
View File
@@ -20,13 +20,13 @@
immunity_type = "burn"
var/damage = 4
/// Areas which are "semi-protected". Mobs inside these areas take reduced burn damage from the solar flare.
var/list/semi_protected_areas = list(/area/hallway/secondary/entry)
var/list/semi_protected_areas = list(/area/station/hallway/secondary/entry)
/datum/weather/solar_flare/generate_area_list()
..()
var/list/bonus_areas = get_areas(/area/solar)
var/list/bonus_areas = get_areas(/area/station/engineering/solar)
// no, solars in space are NOT a subtype of /area/space.
// no, we don't want to re-path every reference to all the subtypes of /area/solar across every map file.
// no, we don't want to re-path every reference to all the subtypes of /area/station/engineering/solar across every map file.
// no, we don't want to change /datum/weather/var/area_type into a list as that requires changing every item that touches weather
for(var/V in bonus_areas)
var/area/A = V