cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[IDB IGNORE][MDB IGNORE] Adds Jungleland as a randomly chosen alternative to Lavaland, [Bounty] (#14802)

Browse Source
This commit is contained in:
Djiq
2024-01-05 19:15:25 +01:00
committed by GitHub
parent 350beb6c46
commit 85db9beea2
160 changed files with 104114 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
code/_onclick/hud/parallax.dm
View File

@@ -21,10 +21,18 @@
C.parallax_layers_cached = list()
C.parallax_layers_cached += new /atom/movable/screen/parallax_layer/layer_1(null, C.view)
C.parallax_layers_cached += new /atom/movable/screen/parallax_layer/layer_2(null, C.view)
if(HAS_TRAIT(SSstation, STATION_TRAIT_MOONSCORCH))
C.parallax_layers_cached += new /atom/movable/screen/parallax_layer/planet/moonscorch(null, C.view)
else
C.parallax_layers_cached += new /atom/movable/screen/parallax_layer/planet(null, C.view)
if(!GLOB.minetype)
stack_trace("GLOB.minetype wasn't set when creating parallax! uh oh!!")
if(GLOB.minetype == MINETYPE_LAVALAND)
if(HAS_TRAIT(SSstation, STATION_TRAIT_MOONSCORCH))
C.parallax_layers_cached += new /atom/movable/screen/parallax_layer/planet/moonscorch(null, C.view)
else
C.parallax_layers_cached += new /atom/movable/screen/parallax_layer/planet(null, C.view)
if(GLOB.minetype == MINETYPE_JUNGLE)
C.parallax_layers_cached += new /atom/movable/screen/parallax_layer/planet/jungle(null, C.view)
if(SSparallax.random_layer)
C.parallax_layers_cached += new SSparallax.random_layer
C.parallax_layers_cached += new /atom/movable/screen/parallax_layer/layer_3(null, C.view)
@@ -341,3 +349,6 @@
/atom/movable/screen/parallax_layer/planet/update_o()
return //Shit wont move
/atom/movable/screen/parallax_layer/planet/jungle
icon_state = "jungleland"

3
code/_onclick/item_attack.dm
View File

@@ -114,7 +114,8 @@
user.do_attack_animation(O)
O.attacked_by(src, user)
user.weapon_slow(src)
take_damage(rand(weapon_stats[DAMAGE_LOW], weapon_stats[DAMAGE_HIGH]), sound_effect = FALSE)
if(!QDELETED(src))
take_damage(rand(weapon_stats[DAMAGE_LOW], weapon_stats[DAMAGE_HIGH]), sound_effect = FALSE)
/atom/movable/proc/attacked_by()
return