Merge branch 'master' of https://github.com/PolarisSS13/Polaris into virologyfixes

This commit is contained in:
Cerebulon
2018-02-07 03:40:06 +00:00
191 changed files with 2301 additions and 996 deletions
@@ -110,6 +110,7 @@
pixel_y = 0
/obj/structure/sign/poster/initialize()
. = ..()
if (poster_type)
var/path = text2path(poster_type)
var/datum/poster/design = new path
+1 -1
View File
@@ -104,7 +104,7 @@ steam.start() -- spawns the effect
T.hotspot_expose(1000,100)
/obj/effect/effect/sparks/initialize()
..()
. = ..()
schedule_task_in(5 SECONDS, /proc/qdel, list(src))
/obj/effect/effect/sparks/Destroy()
+2 -2
View File
@@ -84,9 +84,9 @@
delete_me = 1
/obj/effect/landmark/initialize()
..()
. = ..()
if(delete_me)
qdel(src)
return INITIALIZE_HINT_QDEL
/obj/effect/landmark/Destroy(var/force = FALSE)
if(delete_me || force)
+2 -1
View File
@@ -34,6 +34,7 @@
pixel_y = -32
/obj/effect/temporary_effect/cleave_attack/initialize() // Makes the slash fade smoothly. When completely transparent it should qdel itself.
. = ..()
animate(src, alpha = 0, time = time_to_die - 1)
/obj/effect/temporary_effect/shuttle_landing
@@ -44,4 +45,4 @@
/obj/effect/temporary_effect/shuttle_landing/initialize()
flick("shuttle_warning", src) // flick() forces the animation to always begin at the start.
..()
. = ..()
+5 -3
View File
@@ -129,6 +129,7 @@
var/landmark_id = null
/obj/effect/step_trigger/teleporter/landmark/initialize()
. = ..()
for(var/obj/effect/landmark/teleport_mark/mark in tele_landmarks)
if(mark.landmark_id == landmark_id)
the_landmark = mark
@@ -185,10 +186,11 @@ var/global/list/tele_landmarks = list() // Terrible, but the alternative is loop
return
A.forceMove(T)
if(isliving(A)) // Someday, implement parachutes. For now, just turbomurder whoever falls.
// Living things should probably be logged when they fall...
if(isliving(A))
message_admins("\The [A] fell out of the sky.")
var/mob/living/L = A
L.fall_impact(T, 42, 90, FALSE, TRUE) //You will not be defibbed from this.
// ... because they're probably going to die from it.
A.fall_impact(T, 42, 90, FALSE, TRUE) //You will not be defibbed from this.
else
message_admins("ERROR: planetary_fall step trigger lacks a planet to fall onto.")
return