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

-Laser tag guns no longer give combat tech of 3.

Browse Source 
-Cardborg Helmets and Cueball helmets no longer protect as well as sec helmets. Reorganized the clothing/head.dm. PLEASE take note of the parent when making child objects, people.
-Laser tag vests can now hold their matching laser tag guns.
-Harebells can now be harvested.
-Sprite for the new mini-extinguishers in the extinguisher closets. Needs supporting code still.
-Added towel sprite to items.dmi.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3582 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
d_h2005@yahoo.com
2012-05-12 00:36:32 +00:00
parent 01b59945cc
commit 7cc62d2e7e
9 changed files with 55 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/suits/miscellaneous.dm
+3 -2
View File
@@ -15,14 +15,14 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
/obj/item/clothing/suit/bluetag
name = "blue laser tag armour"
desc = "Blue Pride, Station Wide"
icon_state = "bluetag"
item_state = "bluetag"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
allowed = list (/obj/item/weapon/gun/energy/laser/bluetag)
/obj/item/clothing/suit/redtag
name = "red laser tag armour"
@@ -30,6 +30,7 @@
icon_state = "redtag"
item_state = "redtag"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
allowed = list (/obj/item/weapon/gun/energy/laser/redtag)
/obj/item/clothing/suit/apron
code/modules/projectiles/guns/energy/laser.dm
+3 -2
View File
@@ -82,6 +82,8 @@ obj/item/weapon/gun/energy/laser/retro
icon_state = "bluetag"
desc = "Standard issue weapon of the Imperial Guard"
projectile_type = "/obj/item/projectile/bluetag"
origin_tech = "combat=1;magnets=2"
var/charge_tick = 0
special_check(var/mob/living/carbon/human/M)
if(ishuman(M))
@@ -89,8 +91,6 @@ obj/item/weapon/gun/energy/laser/retro
return 1
M << "\red You need to be wearing your laser tag vest!"
return 0
var/charge_tick = 0
New()
..()
@@ -118,6 +118,7 @@ obj/item/weapon/gun/energy/laser/retro
icon_state = "redtag"
desc = "Standard issue weapon of the Imperial Guard"
projectile_type = "/obj/item/projectile/redtag"
origin_tech = "combat=1;magnets=2"
var/charge_tick = 0
special_check(var/mob/living/carbon/human/M)