cyberpresidentvanellope/GS13-Citadel
1
0
Fork 0
mirror of https://github.com/evilew/GS13-Citadel.git synced 2026-08-27 15:18:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into moretweaks

Browse Source
This commit is contained in:
evilew
2025-05-01 22:21:20 +02:00
parent e2da029704 933d36b051
commit 3dfc65a86c
151 changed files with 23152 additions and 14508 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/elements/decal.dm
+6 -1
View File
@@ -12,6 +12,8 @@
* such collision by forcing a non-collision.
*/
var/rotated
//BLUEMOON FIX - ADDED BY GS13
var/initial_dir // Stores the initial direction of the decal
/datum/element/decal/Attach(atom/target, _icon, _icon_state, _dir, _cleanable=CLEAN_GOD, _color, _layer=TURF_LAYER, _description, _alpha=255, _rotated=FALSE)
. = ..()
@@ -20,6 +22,8 @@
description = _description
cleanable = _cleanable
rotated = _rotated
//BLUEMOON FIX - ADDED BY GS13
initial_dir = _dir // Store the initial direction
RegisterSignal(target,COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(apply_overlay), TRUE)
if(isturf(target))
@@ -63,7 +67,8 @@
/datum/element/decal/proc/apply_overlay(atom/source, list/overlay_list)
SIGNAL_HANDLER
//BLUEMOON FIX - ADDED BY GS13
pic.dir = initial_dir // Use the initial direction instead of the turf's direction
overlay_list += pic
/datum/element/decal/proc/shuttlemove_react(datum/source, turf/newT)
code/datums/mapgen/CaveGenerator.dm
+1 -1
View File
@@ -41,7 +41,7 @@
if(!megafauna_spawn_list)
megafauna_spawn_list = GLOB.megafauna_spawn_list
if(!flora_spawn_list)
flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 2 , /obj/structure/flora/ash/cap_shroom = 2 , /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/ash/tall_shroom = 2)
flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 2 , /obj/structure/flora/ash/cap_shroom = 2 , /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/ash/tall_shroom = 2, /obj/structure/flora/gmushroom/gggmushroom = 2, /obj/structure/flora/shadowtree/shadowtreee = 2, /obj/structure/flora/plasmatree/plasmatreee = 2) //GS13 Edit: trees in caves
if(!feature_spawn_list)
feature_spawn_list = list(/obj/structure/geyser/random = 1)
code/datums/mapgen/Cavegens/LavalandGenerator.dm
+1 -1
View File
@@ -7,7 +7,7 @@
/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/random = 40, /obj/structure/spawner/lavaland = 2, \
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/random = 30, /obj/structure/spawner/lavaland/legion = 3, \
SPAWN_MEGAFAUNA = 4, /mob/living/simple_animal/hostile/asteroid/goldgrub = 10)
flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 2 , /obj/structure/flora/ash/cap_shroom = 2 , /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/ash/tall_shroom = 2, /obj/structure/flora/ashtree = 1)
flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 2 , /obj/structure/flora/ash/cap_shroom = 2 , /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/ash/tall_shroom = 2, /obj/structure/flora/ashtree = 1, /obj/structure/flora/gmushroom/gggmushroom = 2, /obj/structure/flora/shadowtree/shadowtreee = 2, /obj/structure/flora/plasmatree/plasmatreee = 2) //GS13 Edit: trees in lavaland
feature_spawn_list = list(/obj/structure/geyser/random = 1)
initial_closed_chance = 45