mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 20:16:55 +01:00
Merge branch 'master' into findnreplace
This commit is contained in:
@@ -20,6 +20,9 @@
|
||||
wizardstart += loc
|
||||
qdel(src)
|
||||
|
||||
if("avatarspawn")
|
||||
avatarspawn += loc
|
||||
|
||||
if("JoinLate")
|
||||
latejoin += loc
|
||||
qdel(src)
|
||||
@@ -251,7 +254,7 @@
|
||||
new /obj/item/clothing/mask/gas/sexymime(src.loc)
|
||||
new /obj/item/clothing/under/sexymime(src.loc)
|
||||
qdel(src)
|
||||
|
||||
|
||||
/obj/effect/landmark/ruin
|
||||
var/datum/map_template/ruin/ruin_template
|
||||
|
||||
|
||||
Reference in New Issue
Block a user