Merge pull request #2343 from Fox-McCloud/game-mode-cleanup

Removes Nations and Unused Gamemodes
This commit is contained in:
TheDZD
2015-10-13 21:34:49 -04:00
28 changed files with 25 additions and 1220 deletions
-13
View File
@@ -102,19 +102,6 @@
..()
return QDEL_HINT_HARDDEL_NOW
/obj/effect/landmark/nations
name = "nations"
icon = 'icons/mob/screen1.dmi'
icon_state = "x"
anchored = 1.0
/obj/effect/landmark/nations/New()
..()
tag = "nations*[name]"
invisibility = 101
return 1
/obj/effect/landmark/start
name = "start"
icon = 'icons/mob/screen1.dmi'
+1 -1
View File
@@ -156,7 +156,7 @@
desc = "A flag proudly proclaiming the superior heritage of Unathi."
icon_state = "unathiflag"
//Nation Flags (Able to spawn outside Nations gamemode)
//Department Flags
/obj/item/flag/cargo
name = "Cargonia flag"
@@ -37,7 +37,7 @@
max_w_class = 2
storage_slots = 30
can_hold = list() // any
cant_hold = list("/obj/item/weapon/disk/nuclear","/obj/item/flag/nation")
cant_hold = list("/obj/item/weapon/disk/nuclear")
/obj/item/weapon/storage/bag/trash/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] puts the [src.name] over their head and starts chomping at the insides! Disgusting!</span>")
@@ -88,7 +88,7 @@
storage_slots = 7
display_contents_with_number = 0 //or else this will lead to stupid behavior.
can_hold = list() // any
cant_hold = list("/obj/item/weapon/disk/nuclear","/obj/item/flag/nation")
cant_hold = list("/obj/item/weapon/disk/nuclear")
var/head = 0
/obj/item/weapon/storage/bag/plasticbag/mob_can_equip(M as mob, slot)
+3 -6
View File
@@ -318,9 +318,6 @@
return
else
if(!isemptylist(search_contents_for(/obj/item/flag/nation)))
usr << "You get the feeling that you shouldn't cremate one of the items in the cremator."
return
for (var/mob/M in viewers(src))
M.show_message("\red You hear a roar as the crematorium activates.", 1)
@@ -417,7 +414,7 @@
usr << "\red Access denied."
return
/hook/Login/proc/update_morgue(var/client/client, var/mob/L)
/hook/Login/proc/update_morgue(var/client/client, var/mob/L)
//Update morgues on login/logout
if (L.stat == DEAD)
var/obj/structure/morgue/Morgue = null
@@ -440,8 +437,8 @@
Morgue = B.loc
if (Morgue)
Morgue.update()
/hook/Logout/proc/update_morgue(var/client/client, var/mob/L)
/hook/Logout/proc/update_morgue(var/client/client, var/mob/L)
//Update morgues on login/logout
if (L.stat == DEAD)
var/obj/structure/morgue/Morgue = null