April sync (#360)

* Maps and things no code/icons

* helpers defines globalvars

* Onclick world.dm orphaned_procs

* subsystems

Round vote and shuttle autocall done here too

* datums

* Game folder

* Admin - chatter modules

* clothing - mining

* modular computers - zambies

* client

* mob level 1

* mob stage 2 + simple_animal

* silicons n brains

* mob stage 3 + Alien/Monkey

* human mobs

* icons updated

* some sounds

* emitter y u no commit

* update tgstation.dme

* compile fixes

* travis fixes

Also removes Fast digest mode, because reasons.

* tweaks for travis Mentors are broke again

Also fixes Sizeray guns

* oxygen loss fix for vore code.

* removes unused code

* some code updates

* bulk fixes

* further fixes

* outside things

* whoops.

* Maint bar ported

* GLOBs.
This commit is contained in:
Poojawa
2017-04-13 23:37:00 -05:00
committed by GitHub
parent cdc32c98fa
commit 7e9b96a00f
1322 changed files with 174827 additions and 23888 deletions
+4 -6
View File
@@ -63,7 +63,7 @@
impacted_areas |= A
weather_duration = rand(weather_duration_lower, weather_duration_upper)
update_areas()
for(var/V in player_list)
for(var/V in GLOB.player_list)
var/mob/M = V
if(M.z == target_z)
if(telegraph_message)
@@ -77,7 +77,7 @@
return
stage = MAIN_STAGE
update_areas()
for(var/V in player_list)
for(var/V in GLOB.player_list)
var/mob/M = V
if(M.z == target_z)
if(weather_message)
@@ -92,7 +92,7 @@
return
stage = WIND_DOWN_STAGE
update_areas()
for(var/V in player_list)
for(var/V in GLOB.player_list)
var/mob/M = V
if(M.z == target_z)
if(end_message)
@@ -126,7 +126,6 @@
var/area/N = V
N.layer = overlay_layer
N.icon = 'icons/effects/weather_effects.dmi'
N.invisibility = 0
N.color = weather_color
switch(stage)
if(STARTUP_STAGE)
@@ -137,8 +136,7 @@
N.icon_state = end_overlay
if(END_STAGE)
N.color = null
N.icon_state = initial(N.icon_state)
N.icon_state = ""
N.icon = 'icons/turf/areas.dmi'
N.layer = AREA_LAYER //Just default back to normal area stuff since I assume setting a var is faster than initial
N.invisibility = INVISIBILITY_MAXIMUM
N.set_opacity(FALSE)
+31
View File
@@ -168,6 +168,7 @@
sleep(300)
revoke_maint_all_access() // Need to make this a timer at some point.
/datum/weather/rad_storm/proc/status_alarm(command) //Makes the status displays show the radiation warning for those who missed the announcement.
var/datum/radio_frequency/frequency = SSradio.return_frequency(1435)
@@ -185,3 +186,33 @@
status_signal.data["picture_state"] = "radiation"
frequency.post_signal(src, status_signal)
/datum/weather/acid_rain
name = "acid rain"
desc = "Some stay dry and others feel the pain"
telegraph_duration = 400
telegraph_message = "<span class='danger'>Stinging droplets start to fall upon you..</span>"
telegraph_sound = 'sound/ambience/acidrain_start.ogg'
weather_message = "<span class='userdanger'><i>Your skin melts underneath the rain!</i></span>"
weather_overlay = "acid_rain"
weather_duration_lower = 600
weather_duration_upper = 1500
weather_sound = 'sound/ambience/acidrain_mid.ogg'
end_duration = 100
end_message = "<span class='notice'>The rain starts to dissipate.</span>"
end_sound = 'sound/ambience/acidrain_end.ogg'
area_type = /area/lavaland/surface/outdoors
target_z = ZLEVEL_LAVALAND
immunity_type = "acid" // temp
/datum/weather/acid_rain/impact(mob/living/L)
var/resist = L.getarmor(null, "acid")
if(prob(max(0,100-resist)))
L.acid_act(20,20)