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

Bleeding edgy refresh (#303)

Browse Source 
* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
This commit is contained in:
Poojawa
2017-03-21 11:44:10 -05:00
committed by GitHub
parent 099a6c8764
commit f67e9f6d87
1476 changed files with 344416 additions and 40694 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/caseless.dm
+5 -5
View File
@@ -82,7 +82,7 @@
modified = 1
FD.modified = 1
FD.damage_type = BRUTE
user << "<span class='notice'>You pop the safety cap off of [src].</span>"
to_chat(user, "<span class='notice'>You pop the safety cap off of [src].</span>")
update_icon()
else if (istype(A, /obj/item/weapon/pen))
if(modified)
@@ -92,11 +92,11 @@
FD.pen = A
FD.damage = 5
FD.nodamage = 0
user << "<span class='notice'>You insert [A] into [src].</span>"
to_chat(user, "<span class='notice'>You insert [A] into [src].</span>")
else
user << "<span class='warning'>There's already something in [src].</span>"
to_chat(user, "<span class='warning'>There's already something in [src].</span>")
else
user << "<span class='warning'>The safety cap prevents you from inserting [A] into [src].</span>"
to_chat(user, "<span class='warning'>The safety cap prevents you from inserting [A] into [src].</span>")
else
return ..()
@@ -106,7 +106,7 @@
FD.damage = initial(FD.damage)
FD.nodamage = initial(FD.nodamage)
user.put_in_hands(FD.pen)
user << "<span class='notice'>You remove [FD.pen] from [src].</span>"
to_chat(user, "<span class='notice'>You remove [FD.pen] from [src].</span>")
FD.pen = null
/obj/item/ammo_casing/caseless/foam_dart/riot
code/modules/projectiles/ammunition/energy.dm
+12 -28
View File
@@ -8,6 +8,18 @@
fire_sound = 'sound/weapons/Laser.ogg'
firing_effect_type = /obj/effect/overlay/temp/dir_setting/firing_effect/energy
/obj/item/ammo_casing/energy/chameleon
e_cost = 0
var/list/projectile_vars = list()
/obj/item/ammo_casing/energy/chameleon/ready_proj()
. = ..()
if(!BB)
newshot()
for(var/V in projectile_vars)
if(BB.vars[V])
BB.vars[V] = projectile_vars[V]
/obj/item/ammo_casing/energy/laser
projectile_type = /obj/item/projectile/beam/laser
select_name = "kill"
@@ -222,31 +234,3 @@
/obj/item/ammo_casing/energy/plasma/adv
projectile_type = /obj/item/projectile/plasma/adv
/obj/item/ammo_casing/energy/plasmagun
projectile_type = /obj/item/projectile/energy/plasmabolt
e_cost = 50
fire_sound = 'sound/weapons/elecfire.ogg'
/obj/item/ammo_casing/energy/plasmagun/rifle
projectile_type = /obj/item/projectile/energy/plasmabolt/rifle
e_cost = 150
/obj/item/ammo_casing/energy/plasmagun/light
projectile_type = /obj/item/projectile/energy/plasmabolt/light
e_cost = 50
/obj/item/ammo_casing/energy/plasmagun/MP40k
projectile_type = /obj/item/projectile/energy/plasmabolt/MP40k
e_cost = 75
/obj/item/ammo_casing/energy/megabuster
projectile_type = /obj/item/projectile/energy/megabuster
fire_sound = 'sound/weapons/megabuster.ogg'
e_cost = 5
/obj/item/ammo_casing/energy/buster
e_cost = 25
projectile_type = /obj/item/projectile/energy/buster
fire_sound = 'sound/weapons/mmlbuster.ogg'
code/modules/projectiles/ammunition/plasma.dm
+27
View File
@@ -0,0 +1,27 @@
/obj/item/ammo_casing/energy/plasmagun
projectile_type = /obj/item/projectile/energy/plasmabolt
e_cost = 50
fire_sound = 'sound/weapons/elecfire.ogg'
/obj/item/ammo_casing/energy/plasmagun/rifle
projectile_type = /obj/item/projectile/energy/plasmabolt/rifle
e_cost = 150
/obj/item/ammo_casing/energy/plasmagun/light
projectile_type = /obj/item/projectile/energy/plasmabolt/light
e_cost = 50
/obj/item/ammo_casing/energy/plasmagun/MP40k
projectile_type = /obj/item/projectile/energy/plasmabolt/MP40k
e_cost = 75
/obj/item/ammo_casing/energy/megabuster
projectile_type = /obj/item/projectile/energy/megabuster
fire_sound = 'sound/weapons/megabuster.ogg'
e_cost = 5
/obj/item/ammo_casing/energy/buster
e_cost = 25
projectile_type = /obj/item/projectile/energy/buster
fire_sound = 'sound/weapons/mmlbuster.ogg'