cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1206 from Erthilo/TGUpdates

Browse Source 
TG Update r3659 to r3681
This commit is contained in:
SkyMarshal
2012-05-31 20:00:50 -07:00
parent 5370676e05 c921336849
commit cb432489cb
133 changed files with 1784 additions and 1545 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/candle.dm
+2 -1
View File
@@ -95,7 +95,8 @@
w_class = 1
throwforce = 2
var/candlecount = 5
flags = ONBELT | TABLEPASS
flags = TABLEPASS
slot_flags = SLOT_BELT
/obj/item/weapon/candlepack/update_icon()
code/game/objects/items/clothing.dm
+4 -25
View File
@@ -434,10 +434,10 @@ THERMAL GLASSES
M.disabilities &= ~1
..()
/obj/item/clothing/head/helmet/space/rig/engspace_helmet/attack_self()
/obj/item/clothing/head/helmet/space/engineer/attack_self()
toggle()
/obj/item/clothing/head/helmet/space/rig/engspace_helmet/verb/toggle()
/obj/item/clothing/head/helmet/space/engineer/verb/toggle()
set category = "Object"
set name = "Toggle Helmet Visor"
if(usr.canmove && usr.stat != 2 && !usr.restrained())
@@ -445,34 +445,13 @@ THERMAL GLASSES
src.up = !src.up
src.see_face = !src.see_face
src.flags |= HEADCOVERSEYES
icon_state = "engspace_helmet"
icon_state = "[initial(icon_state)]"
usr << "You toggle the reflective tint on."
else
src.up = !src.up
src.see_face = !src.see_face
src.flags &= ~HEADCOVERSEYES
icon_state = "engspace_helmet_clear"
usr << "You toggle the reflective tint off."
usr.update_clothing()
/obj/item/clothing/head/helmet/space/rig/cespace_helmet/attack_self()
toggle()
/obj/item/clothing/head/helmet/space/rig/cespace_helmet/verb/toggle()
set category = "Object"
set name = "Toggle Helmet Visor"
if(usr.canmove && usr.stat != 2 && !usr.restrained())
if(src.up)
src.up = !src.up
src.see_face = !src.see_face
src.flags |= HEADCOVERSEYES
icon_state = "cespace_helmet"
usr << "You toggle the reflective tint on."
else
src.up = !src.up
src.see_face = !src.see_face
src.flags &= ~HEADCOVERSEYES
icon_state = "cespace_helmet_clear"
icon_state = "[initial(icon_state)]_clear"
usr << "You toggle the reflective tint off."
usr.update_clothing()
code/game/objects/items/robot_parts.dm
+2 -1
View File
@@ -3,7 +3,8 @@
icon = 'robot_parts.dmi'
item_state = "buildpipe"
icon_state = "blank"
flags = FPRINT | ONBELT | TABLEPASS | CONDUCT
flags = FPRINT | TABLEPASS | CONDUCT
slot_flags = SLOT_BELT
var/construction_time = 100
var/list/construction_cost = list("metal"=20000,"glass"=5000)
code/game/objects/items/trash.dm
+4 -1
View File
@@ -61,7 +61,8 @@
desc = "A heavy-duty, no fun allowed trash bag."
var/mode = 1; //0 = pick one at a time, 1 = pick all on tile
var/capacity = 25; //the number of trash it can carry.
flags = FPRINT | TABLEPASS | ONBELT
flags = FPRINT | TABLEPASS
slot_flags = SLOT_BELT
w_class = 2.0
/obj/item/weapon/trashbag/update_icon()
@@ -91,6 +92,7 @@
if(contents.len < capacity) //slightly redundant, but it makes it prettier in the chatbox. -Pete
user << "\blue You pick up all the trash."
for(var/obj/item/O in get_turf(W))
if(istype(O, /obj/item/weapon/disk/nuclear)) continue //No nuke disks - Nodrak
if(contents.len < capacity)
if(O.w_class <= 2)
contents += O;
@@ -100,6 +102,7 @@
else
user << "\blue The bag is full!"
else
if(istype(W, /obj/item/weapon/disk/nuclear)) return //No nuke disks - Nodrak
if(contents.len < capacity)
contents += W;
else
code/game/objects/items/weapons/cameras.dm
+2 -2
View File
@@ -42,7 +42,8 @@
icon_state = "camera"
item_state = "electropack"
w_class = 2.0
flags = 466.0
flags = FPRINT | CONDUCT | USEDELAY | TABLEPASS
slot_flags = SLOT_BELT
m_amt = 2000
throwforce = 5
throw_speed = 4
@@ -51,7 +52,6 @@
var/pictures_left = 30
var/can_use = 1
/obj/item/weapon/photo
name = "photo"
icon = 'items.dmi'
code/game/objects/items/weapons/cigs_lighters.dm
+12 -8
View File
@@ -65,7 +65,8 @@ ZIPPO
icon_state = "matchbox"
item_state = "zippo"
w_class = 1
flags = ONBELT | TABLEPASS
flags = TABLEPASS
slot_flags = SLOT_BELT
var/matchcount = 10
w_class = 1.0
@@ -122,6 +123,7 @@ ZIPPO
var/lastHolder = null
var/smoketime = 300
var/butt_count = 5 //count of butt sprite variations
proc
light(var/flavor_text = "[usr] lights the [name].")
@@ -162,7 +164,6 @@ ZIPPO
processing_objects.Add(src)
process()
var/turf/location = get_turf(src)
src.smoketime--
@@ -251,6 +252,7 @@ ZIPPO
var/lastHolder = null
var/smoketime = 100
var/maxsmoketime = 100 //make sure this is equal to your smoketime
proc
light(var/flavor_text = "[usr] lights the [name].")
@@ -337,7 +339,8 @@ ZIPPO
item_state = "cigpacket"
w_class = 1
throwforce = 2
flags = ONBELT | TABLEPASS
flags = TABLEPASS
slot_flags = SLOT_BELT
var/cigcount = 6
@@ -381,7 +384,8 @@ ZIPPO
var/icon_off = "lighter-g"
w_class = 1
throwforce = 4
flags = ONBELT | TABLEPASS | CONDUCT
flags = TABLEPASS | CONDUCT
slot_flags = SLOT_BELT
var/lit = 0
/obj/item/weapon/lighter/zippo
@@ -409,16 +413,16 @@ ZIPPO
src.item_state = icon_on
if( istype(src,/obj/item/weapon/lighter/zippo) )
for(var/mob/O in viewers(user, null))
O.show_message(text("\red Without even breaking stride, [] flips open and lights [] in one smooth movement.", user, src), 1)
O.show_message(text("\red Without even breaking stride, \the [] flips open and lights \the [] in one smooth movement.", user, src), 1)
else
if(prob(75))
for(var/mob/O in viewers(user, null))
O.show_message("\red After a few attempts, [user] manages to light [src].", 1)
O.show_message("\red After a few attempts, \the [user] manages to light \the [src].", 1)
else
user << "\red <b>You burn yourself while lighting the lighter.</b>"
user.adjustFireLoss(5)
for(var/mob/O in viewers(user, null))
O.show_message("\red After a few attempts, [user] manages to light [src], they however burn their finger in the process.", 1)
O.show_message("\red After a few attempts, \the [user] manages to light \the [src], they however burn themself in the process.", 1)
user.total_luminosity += 2
processing_objects.Add(src)
@@ -471,4 +475,4 @@ ZIPPO
if(lit)
user.total_luminosity -= 2
src.sd_SetLuminosity(2)
return
return
code/game/objects/items/weapons/grenades.dm
+17 -10
View File
@@ -16,14 +16,17 @@ FLASHBANG
item_state = "emp"
throw_speed = 4
throw_range = 20
flags = FPRINT | TABLEPASS | CONDUCT | ONBELT
flags = FPRINT | TABLEPASS | CONDUCT
slot_flags = SLOT_BELT
origin_tech = "materials=2;magnets=3"
var/active = 0
var/det_time = 50
proc
prime()
clown_check(var/mob/living/user)
proc/prime()
return
proc/clown_check(var/mob/living/user)
return
afterattack(atom/target as mob|obj|turf|area, mob/user as mob)
if (istype(target, /obj/item/weapon/storage)) return ..() // Trying to put it in a full container
@@ -89,16 +92,21 @@ FLASHBANG
item_state = "flashbang"
throw_speed = 4
throw_range = 20
flags = FPRINT | TABLEPASS | CONDUCT | ONBELT
flags = FPRINT | TABLEPASS | CONDUCT
slot_flags = SLOT_BELT
origin_tech = "materials=2;combat=1"
var/active = 0
var/det_time = 30
var/banglet = 0
proc
bang(var/turf/T , var/mob/living/carbon/M)
prime()
clown_check(var/mob/living/user)
proc/bang(var/turf/T , var/mob/living/carbon/M)
return
proc/prime()
return
proc/clown_check(var/mob/living/user)
return
attackby(obj/item/weapon/W as obj, mob/user as mob)
if (isscrewdriver(W))
@@ -227,7 +235,6 @@ FLASHBANG
M << "\red Your ears start to ring!"
prime() // Prime now just handles the two loops that query for people in lockers and people who can see it.
var/turf/T = get_turf(src)
if(T)
T.hotspot_expose(700,125)
code/game/objects/items/weapons/implants/implant.dm
+19 -8
View File
@@ -7,19 +7,29 @@
icon_state = "implant"
var/implanted = null
var/mob/imp_in = null
var/color = "b"
color = "b"
var/allow_reagents = 0
proc
trigger(emote, source as mob)
activate()
implanted(source as mob)
get_data()
hear(message, source as mob)
proc/trigger(emote, source as mob)
return
proc/activate()
return
proc/implanted(source as mob)
return
proc/get_data()
return
proc/hear(message, source as mob)
return
trigger(emote, source as mob)
return
activate()
return
@@ -38,6 +48,7 @@
implanted(source as mob)
return
get_data()
return "No information available"
@@ -449,4 +460,4 @@ the implant may become unstable and either pre-maturely inject the subject or si
usr << "You suddenly start seeing body temperatures of whoever is around you."
else
usr << "This implant is not compatible!"
return*/
return*/
code/game/objects/items/weapons/mops_cleaners.dm
+8 -5
View File
@@ -6,7 +6,8 @@
name = "space cleaner"
icon_state = "cleaner"
item_state = "cleaner"
flags = ONBELT|TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY
flags = TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY
slot_flags = SLOT_BELT
throwforce = 3
w_class = 2.0
throw_speed = 2
@@ -117,7 +118,8 @@
name = "chem sprayer"
icon_state = "chemsprayer"
item_state = "chemsprayer"
flags = ONBELT|TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY
flags = TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY
slot_flags = SLOT_BELT
throwforce = 3
w_class = 3.0
throw_speed = 2
@@ -212,7 +214,6 @@
return
return
//Pepper spray, set up to make the 2 different types
/obj/item/weapon/pepperspray //This is riot control
@@ -221,7 +222,8 @@
name = "pepperspray"
icon_state = "pepperspray"
item_state = "pepperspray"
flags = ONBELT|TABLEPASS|FPRINT|USEDELAY
flags = TABLEPASS | FPRINT | USEDELAY
slot_flags = SLOT_BELT
throwforce = 3
w_class = 2.0
throw_speed = 2
@@ -236,7 +238,8 @@
name = "mace"
icon_state = "pepperspray"
item_state = "pepperspray"
flags = ONBELT|TABLEPASS|FPRINT|USEDELAY
flags = TABLEPASS | FPRINT | USEDELAY
slot_flags = SLOT_BELT
throwforce = 3
w_class = 1.0
throw_speed = 2
code/game/objects/items/weapons/paint.dm
+1 -2
View File
@@ -63,14 +63,13 @@ var/global/list/cached_icons = list()
remover
paint_type = "remover"
/*
/obj/item/weapon/paint
name = "Paint Can"
desc = "Used to recolor floors and walls. Can not be removed by the janitor."
icon = 'items.dmi'
icon_state = "paint_neutral"
var/color = "FFFFFF"
color = "FFFFFF"
item_state = "paintcan"
w_class = 3.0
code/game/objects/items/weapons/plant_bag.dm
+2 -1
View File
@@ -7,7 +7,8 @@
name = "Plant Bag"
var/mode = 1; //0 = pick one at a time, 1 = pick all on tile
var/capacity = 50; //the number of plant pieces it can carry.
flags = FPRINT | TABLEPASS | ONBELT
flags = FPRINT | TABLEPASS
slot_flags = SLOT_BELT
w_class = 1
/obj/item/weapon/plantbag/attack_self(mob/user as mob)
code/game/objects/items/weapons/tools.dm
+6 -4
View File
@@ -15,7 +15,8 @@ WELDINGTOOOL
desc = "A wrench with common uses. Can be found in your hand."
icon = 'items.dmi'
icon_state = "wrench"
flags = FPRINT | TABLEPASS| CONDUCT | ONBELT
flags = FPRINT | TABLEPASS| CONDUCT
slot_flags = SLOT_BELT
force = 5.0
throwforce = 7.0
w_class = 2.0
@@ -46,7 +47,8 @@ WELDINGTOOOL
name = "Welding Tool"
icon = 'items.dmi'
icon_state = "welder"
flags = FPRINT | TABLEPASS| CONDUCT | ONBELT
flags = FPRINT | TABLEPASS| CONDUCT
slot_flags = SLOT_BELT
force = 3.0
throwforce = 5.0
throw_speed = 1
@@ -225,7 +227,6 @@ WELDINGTOOOL
src.damtype = "brute"
src.icon_state = "welder"
src.welding = 0
return
eyecheck(mob/user as mob)
@@ -314,7 +315,8 @@ WELDINGTOOOL
desc = "This cuts wires."
icon = 'items.dmi'
icon_state = "cutters"
flags = FPRINT | TABLEPASS| CONDUCT | ONBELT
flags = FPRINT | TABLEPASS| CONDUCT
slot_flags = SLOT_BELT
force = 6.0
throw_speed = 2
throw_range = 9
code/game/objects/items/weapons/twohanded.dm
+1 -1
View File
@@ -93,7 +93,7 @@
desc = "Truly, the weapon of a madman. Who would think to fight fire with an axe?"
force = 5
w_class = 4.0
flags = ONBACK
slot_flags = SLOT_BACK
force_unwielded = 5
force_wielded = 18