cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 23:17:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Stunglove overhaul: part two- gloves now lose all insulation when you wire them up.

Browse Source 
Sleepypens have been removed!
Paralysis pens have been slightly nerfed, but look like regular pens.
Changed uplink implants to give five crystals instead of four.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2447 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2011-10-29 18:44:31 +00:00
parent bcda8f9a28
commit 2f84e522cb
7 changed files with 53 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/obj/clothing/gloves.dm
+2 -5
View File
@@ -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"
code/defines/obj/weapon.dm
+5
View File
@@ -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"
code/game/objects/devices/PDA/uplink.dm
+4 -4
View File
@@ -42,9 +42,9 @@
menu_message += "<A href='byond://?src=\ref[src];buy_item=voice'>Voice-Changer</A> (4)<BR>"
menu_message += "<BR>"
menu_message += "<A href='byond://?src=\ref[src];buy_item=imp_freedom'>Freedom Implant (with injector)</A> (3)<BR>"
menu_message += "<A href='byond://?src=\ref[src];buy_item=imp_uplink'>Uplink Implant (4 crystals inside)</A> (10)<BR>"
menu_message += "<A href='byond://?src=\ref[src];buy_item=paralysispen'>Paralysis Pen</A> (3)<BR>"
menu_message += "<A href='byond://?src=\ref[src];buy_item=sleepypen'>Sleepy Pen</A> (5)<BR>"
menu_message += "<A href='byond://?src=\ref[src];buy_item=imp_uplink'>Uplink Implant (5 crystals inside)</A> (10)<BR>"
menu_message += "<A href='byond://?src=\ref[src];buy_item=paralysispen'>Paralysis Pen</A> (3)<BR>" //Note that this goes to the updated sleepypen now.
// menu_message += "<A href='byond://?src=\ref[src];buy_item=sleepypen'>Sleepy Pen</A> (5)<BR>" //Terrible -Pete.
menu_message += "<BR>"
menu_message += "<A href='byond://?src=\ref[src];buy_item=detomatix'>Detomatix Cartridge</A> (3)<BR>"
menu_message += "<A href='byond://?src=\ref[src];buy_item=bomb'>Plastic Explosives</A> (2)<BR>"
@@ -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
code/game/objects/items.dm
+26 -3
View File
@@ -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
code/game/objects/items/weapons/stungloves.dm
+8 -3
View File
@@ -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"
overlays += "gloves_cell"
/obj/item/clothing/gloves/New()
siemens_coefficient_archived = siemens_coefficient
code/game/objects/items/weapons/uplinks.dm
+5 -30
View File
@@ -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]<BR><BR><A href='byond://?src=\ref[src];temp=1'>Clear</A>"
else
dat = "<B>Syndicate Uplink Console:</B><BR>"
dat = "<B>Syndicate Uplink Access:</B><BR>"
dat += "Tele-Crystals left: [src.uses]<BR>"
dat += "<HR>"
dat += "<B>Request item:</B><BR>"
dat += "<I>Each item costs a number of tele-crystals as indicated by the number following their name.</I><BR>"
dat += "<BR>"
dat += "<A href='byond://?src=\ref[src];buy_item=revolver'>Revolver</A> (6)<BR>"
dat += "<A href='byond://?src=\ref[src];buy_item=revolver_ammo'>Ammo-357</A> for use with Revolver (2)<BR>"
dat += "<A href='byond://?src=\ref[src];buy_item=suffocation_revolver_ammo'>Ammo-418</A> for use with Revolver (3)<BR>"
dat += "<A href='byond://?src=\ref[src];buy_item=xbow'>Energy Crossbow</A> (5)<BR>"
dat += "<A href='byond://?src=\ref[src];buy_item=sword'>Energy Sword</A> (4)<BR>"
dat += "<BR>"
@@ -45,8 +42,8 @@ SYNDICATE UPLINK
dat += "<A href='byond://?src=\ref[src];buy_item=voice'>Voice-Changer</A> (4)<BR>"
dat += "<BR>"
dat += "<A href='byond://?src=\ref[src];buy_item=imp_freedom'>Freedom Implant (with injector)</A> (3)<BR>"
dat += "<A href='byond://?src=\ref[src];buy_item=paralysispen'>Paralysis Pen</A> (3)<BR>"
dat += "<A href='byond://?src=\ref[src];buy_item=sleepypen'>Sleepy Pen</A> (5)<BR>"
dat += "<A href='byond://?src=\ref[src];buy_item=paralysispen'>Paralysis Pen</A> (3)<BR>" //Note that this goes to the updated sleepypen now.
// dat += "<A href='byond://?src=\ref[src];buy_item=sleepypen'>Sleepy Pen</A> (5)<BR>" //Terrible -Pete.
dat += "<BR>"
dat += "<A href='byond://?src=\ref[src];buy_item=detomatix'>Detomatix Cartridge</A> (3)<BR>"
dat += "<A href='byond://?src=\ref[src];buy_item=bomb'>Plastic Explosives</A> (2)<BR>"
@@ -59,11 +56,9 @@ SYNDICATE UPLINK
dat += "<A href='byond://?src=\ref[src];buy_item=empbox'>5 EMP Grenades</A> (4)<BR>"
dat += "<BR>"
dat += "<A href='byond://?src=\ref[src];buy_item=botchat'>Binary Translator</A> (3)<BR>"
dat += "<A href='byond://?src=\ref[src];buy_item=lawmod'>Hacked AI Module</A> (7)<BR>"
dat += "<BR>"
dat += "<A href='byond://?src=\ref[src];buy_item=toolbox'>Syndicate Toolbox</A> (Includes various tools) (1)<BR>"
dat += "<A href='byond://?src=\ref[src];buy_item=soap'>Syndicate Soap</A> (1)<BR>"
dat += "<A href='byond://?src=\ref[src];buy_item=balloon'>Syndicate Balloon</A> (Useless) (10)<BR>"
dat += "<HR>"
if (src.origradio)
dat += "<A href='byond://?src=\ref[src];lock=1'>Lock</A><BR>"
@@ -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()
html/changelog.html
+3 -1
View File
@@ -58,7 +58,9 @@ should be listed in the changelog upon commit tho. Thanks. -->
<ul>
<li><b>Petethegoat updated:</b>
<ul>
<li>Stunglove overhaul: part one. Stun gloves are now made by wiring a pair of gloves, and then attaching a battery- this shows up on the object sprite, but not on your character. Stungloves use 2500 charge per stun! This means that some low capacity batteries will make <i>useless</i> stungloves. To get your old inconspicous gloves back, simply cut away the wire and battery. <b>Yet to come:</b> insulated gloves losing their insulative properties when wired, and stungloves taking extra damage from shocked doors.</li>
<li>Stunglove overhaul: part one. Stun gloves are now made by wiring a pair of gloves, and then attaching a battery- this shows up on the object sprite, but not on your character. Stungloves use 2500 charge per stun! This means that some low capacity batteries will make <i>useless</i> stungloves. To get your old inconspicous gloves back, simply cut away the wire and battery. <font color='red'>Note that insulated gloves lose their insulation when you wire them up!</font> <b>Yet to come:</b> stungloves taking extra damage from shocked doors.</li>
<li><font color='red'>Removed sleepypens!</font> Paralysis pens have been changed to look like normal pens instead of penlights, and have been slightly nerfed. They will paralyse for about fifteen seconds, and cause minor brain damage and dizziness.
<li>Uplink Implants now have five telecrystals instead of four.
</ul>
</li>
<li><b>Doohl updated:</b>