diff --git a/code/defines/obj/clothing/gloves.dm b/code/defines/obj/clothing/gloves.dm index 29f8957f200..eb52d275dbf 100644 --- a/code/defines/obj/clothing/gloves.dm +++ b/code/defines/obj/clothing/gloves.dm @@ -7,14 +7,11 @@ protective_temperature = 400 heat_transfer_coefficient = 0.25 siemens_coefficient = 0.50 -// var/elecgen = 0 //WHAT THE FUCK IS THIS SHIT OH GOD WHY ;-; -// var/uses = 0 //NOPE NOPE NOPE NOPE + var/siemens_coefficient_archived = 0 var/wired = 0 var/obj/item/weapon/cell/cell = 0 body_parts_covered = HANDS -//(CAPS IS CRUISE CONTROL FOR COOL AS WE ALL KNOW) - /obj/item/clothing/gloves/white name = "White Gloves" desc = "These look pretty fancy." @@ -95,7 +92,7 @@ var/mindrain = 200 var/maxdrain = 400 -//BEEP BEEP IT'S THE COMMENT BRIGADE -Pete +//BEEP BEEP IT'S THE COMMENT BRIGADE -Pete (gloves overhaul) /* /obj/item/clothing/gloves/stungloves/ name = "Stungloves" diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 6bbe72c4363..b681f50ffdc 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -880,6 +880,11 @@ throw_range = 15 /obj/item/weapon/pen/sleepypen + desc = "It's a normal black ink pen with a sharp point and a carefully engraved \"Waffle Co.\"" + flags = FPRINT | ONBELT | TABLEPASS | OPENCONTAINER + origin_tech = "materials=2;biotech=1;syndicate=7" + +/obj/item/weapon/pen/paralysis desc = "It's a normal black ink pen with a sharp point." flags = FPRINT | ONBELT | TABLEPASS | OPENCONTAINER origin_tech = "materials=2;biotech=1;syndicate=5" diff --git a/code/game/objects/devices/PDA/uplink.dm b/code/game/objects/devices/PDA/uplink.dm index 6fca00f753b..610fcfebe8d 100644 --- a/code/game/objects/devices/PDA/uplink.dm +++ b/code/game/objects/devices/PDA/uplink.dm @@ -42,9 +42,9 @@ menu_message += "Voice-Changer (4)
" menu_message += "
" menu_message += "Freedom Implant (with injector) (3)
" - menu_message += "Uplink Implant (4 crystals inside) (10)
" - menu_message += "Paralysis Pen (3)
" - menu_message += "Sleepy Pen (5)
" + menu_message += "Uplink Implant (5 crystals inside) (10)
" + menu_message += "Paralysis Pen (3)
" //Note that this goes to the updated sleepypen now. +// menu_message += "Sleepy Pen (5)
" //Terrible -Pete. menu_message += "
" menu_message += "Detomatix Cartridge (3)
" menu_message += "Plastic Explosives (2)
" @@ -148,7 +148,7 @@ if("paralysispen") if (uses >= 3) uses -= 3 - new /obj/item/device/flashlight/pen/paralysis(get_turf(hostpda)) + new /obj/item/weapon/pen/paralysis(get_turf(src)) if("projector") if (uses >= 4) uses -= 4 diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index a1fb5379f2d..aba6910e440 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -189,15 +189,38 @@ return /obj/item/weapon/pen/sleepypen/attack(mob/M as mob, mob/user as mob) - if (!( istype(M, /mob) )) + if(!(istype(M,/mob))) return ..() - if (reagents.total_volume) + if(reagents.total_volume) if(M.reagents) reagents.trans_to(M, 50) //used to be 150 return +//NEW STYLE PARAPEN +/obj/item/weapon/pen/paralysis/attack_paw(mob/user as mob) + return src.attack_hand(user) + return + +/obj/item/weapon/pen/paralysis/attack(mob/M as mob, mob/user as mob) + if(!(istype(M,/mob))) + return + ..() + if(reagents.total_volume) + if(M.reagents) reagents.trans_to(M, 50) + return + +/obj/item/weapon/pen/paralysis/New() + var/datum/reagents/R = new/datum/reagents(50) + reagents = R + R.my_atom = src + R.add_reagent("zombiepowder", 10) + R.add_reagent("impedrezene", 25) + R.add_reagent("cryptobiolin", 15) + ..() + return + /obj/item/weapon/Bump(mob/M as mob) - spawn( 0 ) + spawn(0) ..() return diff --git a/code/game/objects/items/weapons/stungloves.dm b/code/game/objects/items/weapons/stungloves.dm index 5af387774a7..29801a763d4 100644 --- a/code/game/objects/items/weapons/stungloves.dm +++ b/code/game/objects/items/weapons/stungloves.dm @@ -5,6 +5,7 @@ if(C.amount >= 2) C.amount -= 2 wired = 1 + siemens_coefficient = 1 user << "You wrap some wires around [src]." update_icon() else @@ -26,14 +27,15 @@ else if(istype(W, /obj/item/weapon/wirecutters)) if(cell) - user << "You cut the cell away from [src]." cell.loc = get_turf(src.loc) cell = 0 + user << "You cut the cell away from [src]." update_icon() return if(wired) //wires disappear into the void because fuck that shit - user << "You cut the wires away from [src]." wired = 0 + siemens_coefficient = siemens_coefficient_archived + user << "You cut the wires away from [src]." update_icon() ..() return @@ -44,4 +46,7 @@ if(wired) overlays += "gloves_wire" if(cell) - overlays += "gloves_cell" \ No newline at end of file + overlays += "gloves_cell" + +/obj/item/clothing/gloves/New() + siemens_coefficient_archived = siemens_coefficient \ No newline at end of file diff --git a/code/game/objects/items/weapons/uplinks.dm b/code/game/objects/items/weapons/uplinks.dm index eb3d1a3d486..dd7af9b5672 100644 --- a/code/game/objects/items/weapons/uplinks.dm +++ b/code/game/objects/items/weapons/uplinks.dm @@ -4,7 +4,7 @@ SYNDICATE UPLINK */ /obj/item/weapon/syndicate_uplink/implanted - uses = 4 + uses = 5 /obj/item/weapon/syndicate_uplink/proc/explode() var/turf/location = get_turf(src.loc) @@ -27,15 +27,12 @@ SYNDICATE UPLINK if (src.temp) dat = "[src.temp]

Clear" else - dat = "Syndicate Uplink Console:
" + dat = "Syndicate Uplink Access:
" dat += "Tele-Crystals left: [src.uses]
" dat += "
" dat += "Request item:
" dat += "Each item costs a number of tele-crystals as indicated by the number following their name.
" dat += "
" - dat += "Revolver (6)
" - dat += "Ammo-357 for use with Revolver (2)
" - dat += "Ammo-418 for use with Revolver (3)
" dat += "Energy Crossbow (5)
" dat += "Energy Sword (4)
" dat += "
" @@ -45,8 +42,8 @@ SYNDICATE UPLINK dat += "Voice-Changer (4)
" dat += "
" dat += "Freedom Implant (with injector) (3)
" - dat += "Paralysis Pen (3)
" - dat += "Sleepy Pen (5)
" + dat += "Paralysis Pen (3)
" //Note that this goes to the updated sleepypen now. +// dat += "Sleepy Pen (5)
" //Terrible -Pete. dat += "
" dat += "Detomatix Cartridge (3)
" dat += "Plastic Explosives (2)
" @@ -59,11 +56,9 @@ SYNDICATE UPLINK dat += "5 EMP Grenades (4)
" dat += "
" dat += "Binary Translator (3)
" - dat += "Hacked AI Module (7)
" dat += "
" dat += "Syndicate Toolbox (Includes various tools) (1)
" dat += "Syndicate Soap (1)
" - dat += "Syndicate Balloon (Useless) (10)
" dat += "
" if (src.origradio) dat += "Lock
" @@ -85,18 +80,6 @@ SYNDICATE UPLINK currentUser.machine = src if (href_list["buy_item"]) switch(href_list["buy_item"]) - if("revolver") - if (src.uses >= 6) - src.uses -= 6 - new /obj/item/weapon/gun/projectile(get_turf(src)) - if("revolver_ammo") - if (src.uses >= 2) - src.uses -= 2 - new /obj/item/ammo_magazine/a357(get_turf(src)) - if("suffocation_revolver_ammo") - if (uses >= 3) - uses -= 3 - new /obj/item/ammo_magazine/a418(get_turf(src)) if("xbow") if (src.uses >= 5) src.uses -= 5 @@ -137,7 +120,7 @@ SYNDICATE UPLINK if("paralysispen") if (src.uses >= 3) src.uses -= 3 - new /obj/item/device/flashlight/pen/paralysis(get_turf(src)) + new /obj/item/weapon/pen/paralysis(get_turf(src)) if("projector") if (src.uses >= 4) src.uses -= 4 @@ -171,10 +154,6 @@ SYNDICATE UPLINK src.uses -= 3 new /obj/item/clothing/suit/space/syndicate(get_turf(src)) new /obj/item/clothing/head/helmet/space/syndicate(get_turf(src)) - if("lawmod") - if (src.uses >= 7) - src.uses -= 7 - new /obj/item/weapon/aiModule/syndicate(get_turf(src)) if("botchat") if (src.uses >= 3) src.uses -= 3 @@ -187,10 +166,6 @@ SYNDICATE UPLINK if(uses) uses-- new /obj/item/weapon/soap/syndie(get_turf(src)) - if("balloon") - if (src.uses >= 10) - uses -= 10 - new /obj/item/toy/syndicateballoon(get_turf(src)) else if (href_list["lock"] && src.origradio) // presto chango, a regular radio again! (reset the freq too...) shutdown_uplink() diff --git a/html/changelog.html b/html/changelog.html index c0e559274c2..632739920c2 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -58,7 +58,9 @@ should be listed in the changelog upon commit tho. Thanks. -->