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
+12 -7
View File
@@ -6,7 +6,7 @@
item_state = "pen"
origin_tech = "materials=2;combat=4"
flags = CONDUCT
w_class = WEIGHT_CLASS_TINY
w_class = 1
attack_verb = list("poked")
var/emagged = 0
var/fail_message = "<span class='warning'>INVALID USER.</span>"
@@ -95,11 +95,9 @@
var/obj/item/weapon/implant/req_implant = null
/obj/item/device/firing_pin/implant/pin_auth(mob/living/user)
if(iscarbon(user))
var/mob/living/carbon/C = user
for(var/obj/item/weapon/implant/I in C.implants)
if(req_implant && I.type == req_implant)
return 1
for(var/obj/item/weapon/implant/I in user)
if(req_implant && I.imp_in == user && I.type == req_implant)
return 1
return 0
/obj/item/device/firing_pin/implant/mindshield
@@ -113,14 +111,21 @@
icon_state = "firing_pin_pindi"
req_implant = /obj/item/weapon/implant/weapons_auth
/obj/item/device/firing_pin/trick
name = "self-destruct firing pin"
desc = "This pin will detonate the weapon it is put into upon trying to use it"
selfdestruct = 1
force_replace = 1
/obj/item/device/firing_pin/trick/pin_auth(mob/living/user)
return 0
// Honk pin, clown's joke item.
// Can replace other pins. Replace a pin in cap's laser for extra fun!
/obj/item/device/firing_pin/clown
name = "hilarious firing pin"
desc = "Advanced clowntech that can convert any firearm into a far more useful object."
color = "#FFFF00"
color = "yellow"
fail_message = "<span class='warning'>HONK!</span>"
force_replace = 1