Revert "12/21 modernizations from TG live"

This commit is contained in:
LetterJay
2016-12-22 22:35:44 -06:00
committed by GitHub
parent cf59ac1c3d
commit ae40d4134e
2215 changed files with 86928 additions and 707332 deletions
+9 -17
View File
@@ -5,7 +5,7 @@
icon_state = "stamp-ok"
item_state = "stamp"
throwforce = 0
w_class = WEIGHT_CLASS_TINY
w_class = 1
throw_speed = 3
throw_range = 7
materials = list(MAT_METAL=60)
@@ -14,7 +14,7 @@
attack_verb = list("stamped")
/obj/item/weapon/stamp/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] stamps 'VOID' on [user.p_their()] forehead, then promptly falls over, dead.</span>")
user.visible_message("<span class='suicide'>[user] stamps 'VOID' on \his forehead, then promptly falls over, dead.</span>")
return (OXYLOSS)
/obj/item/weapon/stamp/qm
@@ -75,13 +75,11 @@
/obj/item/weapon/stamp/chameleon
actions_types = list(/datum/action/item_action/toggle)
var/list/stamp_types
var/list/stamp_names
/obj/item/weapon/stamp/chameleon/attack_self(mob/user)
/obj/item/weapon/stamp/chameleon/New()
stamp_types = typesof(/obj/item/weapon/stamp) - src.type // Get all stamp types except our own
var/list/stamp_types = typesof(/obj/item/weapon/stamp) - src.type // Get all stamp types except our own
stamp_names = list()
var/list/stamp_names = list()
// Generate them into a list
for(var/i in stamp_types)
var/obj/item/weapon/stamp/stamp_type = i
@@ -89,15 +87,6 @@
stamp_names = sortList(stamp_names)
/obj/item/weapon/stamp/chameleon/emp_act(severity)
change_to(pick(stamp_types))
/obj/item/weapon/stamp/chameleon/proc/change_to(obj/item/weapon/stamp/stamp_type)
name = initial(stamp_type.name)
icon_state = initial(stamp_type.icon_state)
item_color = initial(stamp_type.item_color)
/obj/item/weapon/stamp/chameleon/attack_self(mob/user)
var/input_stamp = input(user, "Choose a stamp to disguise as.",
"Choose a stamp.") as null|anything in stamp_names
@@ -107,4 +96,7 @@
stamp_type = i
if(initial(stamp_type.name) == input_stamp)
break
change_to(stamp_type)
name = initial(stamp_type.name)
icon_state = initial(stamp_type.icon_state)
item_color = initial(stamp_type.item_color)