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

Merge pull request #1044 from Erthilo/master

Browse Source 
TG Updates up to r3585
This commit is contained in:
SkyMarshal
2012-05-13 21:38:34 -07:00
parent 5e45382ded f5bf874d17
commit 46e104f978
24 changed files with 142 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/energy/laser.dm
+3 -2
View File
@@ -86,6 +86,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))
@@ -93,8 +95,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()
..()
@@ -122,6 +122,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)