12/21 modernizations from TG live (#103)
* sync (#3) * shuttle auto call * Merge /vore into /master (#39) * progress * Compile errors fixed No idea if it's test worthy tho as conflicts with race overhaul and narky removal. * Update admins.txt * efforts continue Fuck grab code, seriously * grab code is cancer * Execute the Narkism Do not hesitate. Show no mercy. * holy shit grab code is awful * have I bitched about grab code My bitching, let me show you it * código de agarre es una mierda No really it is * yeah I don't even know anymore. * Lolnope. Fuck grab code * I'm not even sure what to fix anymore * Self eating is not an acceptable fate * Taste the void, son. * My code doesn't pass it's own sanity check. Maybe it's a sign of things to come. * uncommented and notes * It Works and I Don't Know Why (#38) * shuttle auto call * it works and I don't know why * Subsystem 12/21 Most Recent TG subsystem folder * globalvars 12/21 Tossed out the flavor_misc and parallax files * Onclick 12/21 as well as .dme updates * _defines 12/21 ommited old _MC.dm * _HELPERS 12/21 Preserved snowflake placement of furry sprites * _defeines/genetics reapplied narkism holdover for snowflake races. * Oops forgot mutant colors * modules porting 12/21 + Sounds/icons Admin, Client and most of mob life files ommitted * enviroment file * Admin optimizations ahelp log system kept * Mob ports 12/21 Flavor text preserved * datums ported 12/21 * Game ported 12/21 * batch of duplicate fixes/dogborg work Dogborgs need to be modernized to refractored borg standards. * moar fixes * Maps and futher compile fixes
This commit is contained in:
@@ -2,10 +2,10 @@
|
||||
name = "paper cutter"
|
||||
desc = "Standard office equipment. Precisely cuts paper using a large blade."
|
||||
icon = 'icons/obj/bureaucracy.dmi'
|
||||
icon_state = "papercutter-cutter"
|
||||
icon_state = "papercutter"
|
||||
force = 5
|
||||
throwforce = 5
|
||||
w_class = 3
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
var/obj/item/weapon/paper/storedpaper = null
|
||||
var/obj/item/weapon/hatchet/cutterblade/storedcutter = null
|
||||
var/cuttersecured = TRUE
|
||||
@@ -15,15 +15,21 @@
|
||||
/obj/item/weapon/papercutter/New()
|
||||
..()
|
||||
storedcutter = new /obj/item/weapon/hatchet/cutterblade(src)
|
||||
update_icon()
|
||||
|
||||
|
||||
/obj/item/weapon/papercutter/suicide_act(mob/user)
|
||||
if(storedcutter)
|
||||
user.visible_message("<span class='suicide'>[user] is beheading \himself with [src.name]! It looks like \he's trying to commit suicide.</span>")
|
||||
playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
|
||||
user.visible_message("<span class='suicide'>[user] is beheading [user.p_them()]self with [src.name]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
|
||||
if(iscarbon(user))
|
||||
var/mob/living/carbon/C = user
|
||||
var/obj/item/bodypart/BP = C.get_bodypart("head")
|
||||
if(BP)
|
||||
BP.drop_limb()
|
||||
playsound(loc,pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg') ,50, 1, -1)
|
||||
return (BRUTELOSS)
|
||||
else
|
||||
user.visible_message("<span class='suicide'>[user] repeatedly bashes [src.name] against \his head! It looks like \he's trying to commit suicide.</span>")
|
||||
user.visible_message("<span class='suicide'>[user] repeatedly bashes [src.name] against [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!</span>")
|
||||
playsound(loc, 'sound/items/gavel.ogg', 50, 1, -1)
|
||||
return (BRUTELOSS)
|
||||
|
||||
@@ -41,7 +47,7 @@
|
||||
if(!user.drop_item())
|
||||
return
|
||||
playsound(loc, "pageturn", 60, 1)
|
||||
user << "<span class='notice'>You place \the [P] in [src].</span>"
|
||||
user << "<span class='notice'>You place [P] in [src].</span>"
|
||||
P.loc = src
|
||||
storedpaper = P
|
||||
update_icon()
|
||||
@@ -56,16 +62,16 @@
|
||||
return
|
||||
if(istype(P, /obj/item/weapon/screwdriver) && storedcutter)
|
||||
playsound(src, P.usesound, 50, 1)
|
||||
user << "<span class='notice'>\The [storedcutter] has been [cuttersecured ? "unsecured" : "secured"].</span>"
|
||||
user << "<span class='notice'>[storedcutter] has been [cuttersecured ? "unsecured" : "secured"].</span>"
|
||||
cuttersecured = !cuttersecured
|
||||
return
|
||||
..()
|
||||
|
||||
|
||||
/obj/item/weapon/papercutter/attack_hand(mob/user)
|
||||
src.add_fingerprint(user)
|
||||
add_fingerprint(user)
|
||||
if(!storedcutter)
|
||||
user << "<span class='notice'>The cutting blade is gone! You can't use \the [src] now.</span>"
|
||||
user << "<span class='notice'>The cutting blade is gone! You can't use [src] now.</span>"
|
||||
return
|
||||
|
||||
if(!cuttersecured)
|
||||
@@ -76,7 +82,7 @@
|
||||
|
||||
if(storedpaper)
|
||||
playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1)
|
||||
user << "<span class='notice'>You neatly cut \the [storedpaper].</span>"
|
||||
user << "<span class='notice'>You neatly cut [storedpaper].</span>"
|
||||
storedpaper = null
|
||||
qdel(storedpaper)
|
||||
new /obj/item/weapon/paperslip(get_turf(src))
|
||||
@@ -97,11 +103,7 @@
|
||||
if(!remove_item_from_storage(M))
|
||||
if(!M.unEquip(src))
|
||||
return
|
||||
switch(H.slot_id)
|
||||
if(slot_r_hand)
|
||||
M.put_in_r_hand(src)
|
||||
if(slot_l_hand)
|
||||
M.put_in_l_hand(src)
|
||||
M.put_in_hand(src, H.held_index)
|
||||
add_fingerprint(M)
|
||||
|
||||
|
||||
@@ -110,8 +112,9 @@
|
||||
desc = "A little slip of paper left over after a larger piece was cut. Whoa."
|
||||
icon_state = "paperslip"
|
||||
icon = 'icons/obj/bureaucracy.dmi'
|
||||
burn_state = FLAMMABLE
|
||||
burntime = 3
|
||||
resistance_flags = FLAMMABLE
|
||||
obj_integrity = 50
|
||||
max_integrity = 50
|
||||
|
||||
/obj/item/weapon/paperslip/New()
|
||||
..()
|
||||
|
||||
Reference in New Issue
Block a user