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

[WIP][Test merge me please] Rockplanet Revamp! (#6256)

Browse Source 
* Merge the Ruins module into the Mapping module

I was always confused which to use soooo now theyre just the same

* Re-mapping + Files

THIS ISNT WORKING HELPHELPHELP

* wow thats a bad typo

fun fact, missing a single / can keep all ruins from spawning :)

* Ruins atmos + adds

There's probably a better way to do this. I'll probably have to revert the atmos things with this. Oh well.

* fixefixe

hngh

* fix that little pre-spawned ruin

hnngh

* fixes that pre-spawned ruin

hnngh OCD

* Delete quicksand.dmi

whoops

* Apply suggestions from code review

Co-authored-by: Tom <tomforde4@gmail.com>

* makes var-edited turfs into subtypes

i fucking hate it

* adds whiteship LZ (hopefully they all fit?)

* RENAMES ANY CODE MENTION TO "ROCKPLANET" FROM "ASTEROID"

Fixes having to differentiate between Asteroid(Mining planet) and Asteroid(Space object)

* rocklblnbglb

mapp p

* renames asteroid.txt to rockplanet.txt in config

* "sorts" files in the mapping module

while I'm here im gonna tidy it up ok

* fixes map conflicts

* missed a bit

* few gulag tweaks

hehe

* fix random space tile/area fuckery/aaaaaaa

* move mobs stuff about/rename/prep for The Lost

* pretty stuff.,.,.,

MY METAL POLES ARE HERE POG

* lz lz lz

* shower fix ree

Co-authored-by: Tom <tomforde4@gmail.com>
This commit is contained in:
OrionTheFox
2021-07-21 15:46:16 +01:00
committed by GitHub
co-authored by Tom
parent eea94ec56d
commit d33967c931
40 changed files with 16538 additions and 13497 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/debug.dm
+2 -2
View File
@@ -683,8 +683,8 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
for(var/name in SSmapping.ice_ruins_underground_templates)
names[name] = list(SSmapping.ice_ruins_underground_templates[name], ZTRAIT_ICE_RUINS_UNDERGROUND, list(/area/icemoon/underground/unexplored))
//SKYRAT EDIT START//
for(var/name in SSmapping.asteroid_ruins_templates)
names[name] = list(SSmapping.asteroid_ruins_templates[name], ZTRAIT_ASTEROID_RUINS, list(/area/rockplanet/surface/outdoors/unexplored))
for(var/name in SSmapping.rockplanet_ruins_templates)
names[name] = list(SSmapping.rockplanet_ruins_templates[name], ZTRAIT_ROCKPLANET_RUINS, list(/area/rockplanet/surface/outdoors/unexplored))
//SKYRAT EDIT END//
var/ruinname = input("Select ruin", "Spawn Ruin") as null|anything in sortList(names)