shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-29923

Browse Source
This commit is contained in:
LetterJay
2017-08-28 09:19:44 -05:00
committed by GitHub
parent 739d5c70a7 27750d91d6
commit defab9c7fc
1507 changed files with 70692 additions and 85572 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/projectile/bullets.dm
+1 -1
View File
@@ -239,7 +239,7 @@
/obj/item/projectile/bullet/dnainjector
name = "\improper DNA injector"
icon_state = "syringeproj"
var/obj/item/weapon/dnainjector/injector
var/obj/item/dnainjector/injector
damage = 5
hitsound_wall = "shatter"
code/modules/projectiles/projectile/energy.dm
+4 -4
View File
@@ -97,14 +97,14 @@
/obj/item/projectile/energy/trap/on_hit(atom/target, blocked = FALSE)
if(!ismob(target) || blocked >= 100) //Fully blocked by mob or collided with dense object - drop a trap
new/obj/item/weapon/restraints/legcuffs/beartrap/energy(get_turf(loc))
new/obj/item/restraints/legcuffs/beartrap/energy(get_turf(loc))
else if(iscarbon(target))
var/obj/item/weapon/restraints/legcuffs/beartrap/B = new /obj/item/weapon/restraints/legcuffs/beartrap/energy(get_turf(target))
var/obj/item/restraints/legcuffs/beartrap/B = new /obj/item/restraints/legcuffs/beartrap/energy(get_turf(target))
B.Crossed(target)
..()
/obj/item/projectile/energy/trap/on_range()
new /obj/item/weapon/restraints/legcuffs/beartrap/energy(loc)
new /obj/item/restraints/legcuffs/beartrap/energy(loc)
..()
/obj/item/projectile/energy/trap/cyborg
@@ -120,7 +120,7 @@
do_sparks(1, TRUE, src)
qdel(src)
if(iscarbon(target))
var/obj/item/weapon/restraints/legcuffs/beartrap/B = new /obj/item/weapon/restraints/legcuffs/beartrap/energy/cyborg(get_turf(target))
var/obj/item/restraints/legcuffs/beartrap/B = new /obj/item/restraints/legcuffs/beartrap/energy/cyborg(get_turf(target))
B.Crossed(target)
QDEL_IN(src, 10)
..()
code/modules/projectiles/projectile/magic.dm
+2 -2
View File
@@ -261,7 +261,7 @@
if(!new_mob)
return
new_mob.grant_language(/datum/language/common)
SET_SECONDARY_FLAG(new_mob, OMNITONGUE)
new_mob.flags_2 |= OMNITONGUE_2
new_mob.logging = M.logging
// Some forms can still wear some items
@@ -315,7 +315,7 @@
return
else
var/obj/O = src
if(istype(O, /obj/item/weapon/gun))
if(istype(O, /obj/item/gun))
new /mob/living/simple_animal/hostile/mimic/copy/ranged(loc, src, owner)
else
new /mob/living/simple_animal/hostile/mimic/copy(loc, src, owner)
code/modules/projectiles/projectile/reusable.dm
+1 -1
View File
@@ -37,7 +37,7 @@
ammo_type = /obj/item/ammo_casing/caseless/foam_dart
range = 10
var/modified = 0
var/obj/item/weapon/pen/pen = null
var/obj/item/pen/pen = null
/obj/item/projectile/bullet/reusable/foam_dart/handle_drop()
if(dropped)
code/modules/projectiles/projectile/special.dm
+2 -2
View File
@@ -161,7 +161,7 @@
icon_state = "spark"
hitsound = "sparks"
damage = 3
var/obj/item/weapon/gun/energy/wormhole_projector/gun
var/obj/item/gun/energy/wormhole_projector/gun
color = "#33CCFF"
/obj/item/projectile/beam/wormhole/orange
@@ -172,7 +172,7 @@
if(casing)
gun = casing.gun
/obj/item/ammo_casing/energy/wormhole/New(var/obj/item/weapon/gun/energy/wormhole_projector/wh)
/obj/item/ammo_casing/energy/wormhole/New(var/obj/item/gun/energy/wormhole_projector/wh)
gun = wh
/obj/item/projectile/beam/wormhole/on_hit(atom/target)