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/game/objects/items/weapons/pneumaticCannon.dm
+18 -18
View File
@@ -21,12 +21,12 @@
/obj/item/weapon/pneumatic_cannon/examine(mob/user)
..()
if(!in_range(user, src))
user << "<span class='notice'>You'll need to get closer to see any more.</span>"
to_chat(user, "<span class='notice'>You'll need to get closer to see any more.</span>")
return
for(var/obj/item/I in loadedItems)
user << "<span class='info'>\icon [I] It has \the [I] loaded.</span>"
to_chat(user, "<span class='info'>\icon [I] It has \the [I] loaded.</span>")
if(tank)
user << "<span class='notice'>\icon [tank] It has \the [tank] mounted onto it.</span>"
to_chat(user, "<span class='notice'>\icon [tank] It has \the [tank] mounted onto it.</span>")
/obj/item/weapon/pneumatic_cannon/attackby(obj/item/weapon/W, mob/user, params)
@@ -34,11 +34,11 @@
if(!tank)
var/obj/item/weapon/tank/internals/IT = W
if(IT.volume <= 3)
user << "<span class='warning'>\The [IT] is too small for \the [src].</span>"
to_chat(user, "<span class='warning'>\The [IT] is too small for \the [src].</span>")
return
updateTank(W, 0, user)
else if(W.type == type)
user << "<span class='warning'>You're fairly certain that putting a pneumatic cannon inside another pneumatic cannon would cause a spacetime disruption.</span>"
to_chat(user, "<span class='warning'>You're fairly certain that putting a pneumatic cannon inside another pneumatic cannon would cause a spacetime disruption.</span>")
else if(istype(W, /obj/item/weapon/wrench))
switch(pressureSetting)
if(1)
@@ -47,23 +47,23 @@
pressureSetting = 3
if(3)
pressureSetting = 1
user << "<span class='notice'>You tweak \the [src]'s pressure output to [pressureSetting].</span>"
to_chat(user, "<span class='notice'>You tweak \the [src]'s pressure output to [pressureSetting].</span>")
else if(istype(W, /obj/item/weapon/screwdriver))
if(tank)
updateTank(tank, 1, user)
else if(loadedWeightClass >= maxWeightClass)
user << "<span class='warning'>\The [src] can't hold any more items!</span>"
to_chat(user, "<span class='warning'>\The [src] can't hold any more items!</span>")
else if(istype(W, /obj/item))
var/obj/item/IW = W
if((loadedWeightClass + IW.w_class) > maxWeightClass)
user << "<span class='warning'>\The [IW] won't fit into \the [src]!</span>"
to_chat(user, "<span class='warning'>\The [IW] won't fit into \the [src]!</span>")
return
if(IW.w_class > src.w_class)
user << "<span class='warning'>\The [IW] is too large to fit into \the [src]!</span>"
to_chat(user, "<span class='warning'>\The [IW] is too large to fit into \the [src]!</span>")
return
if(!user.transferItemToLoc(W, src))
return
user << "<span class='notice'>You load \the [IW] into \the [src].</span>"
to_chat(user, "<span class='notice'>You load \the [IW] into \the [src].</span>")
loadedItems.Add(IW)
loadedWeightClass += IW.w_class
@@ -82,19 +82,19 @@
return
var/discharge = 0
if(user.dna.check_mutation(HULK))
user << "<span class='warning'>Your meaty finger is much too large for the trigger guard!</span>"
to_chat(user, "<span class='warning'>Your meaty finger is much too large for the trigger guard!</span>")
return
if(NOGUNS in user.dna.species.species_traits)
user << "<span class='warning'>Your fingers don't fit in the trigger guard!</span>"
to_chat(user, "<span class='warning'>Your fingers don't fit in the trigger guard!</span>")
return
if(!loadedItems || !loadedWeightClass)
user << "<span class='warning'>\The [src] has nothing loaded.</span>"
to_chat(user, "<span class='warning'>\The [src] has nothing loaded.</span>")
return
if(!tank)
user << "<span class='warning'>\The [src] can't fire without a source of gas.</span>"
to_chat(user, "<span class='warning'>\The [src] can't fire without a source of gas.</span>")
return
if(tank && !tank.air_contents.remove(gasPerThrow * pressureSetting))
user << "<span class='warning'>\The [src] lets out a weak hiss and doesn't react!</span>"
to_chat(user, "<span class='warning'>\The [src] lets out a weak hiss and doesn't react!</span>")
return
if(user.disabilities & CLUMSY && prob(75))
user.visible_message("<span class='warning'>[user] loses their grip on [src], causing it to go off!</span>", "<span class='userdanger'>[src] slips out of your hands and goes off!</span>")
@@ -144,17 +144,17 @@
if(removing)
if(!src.tank)
return
user << "<span class='notice'>You detach \the [thetank] from \the [src].</span>"
to_chat(user, "<span class='notice'>You detach \the [thetank] from \the [src].</span>")
src.tank.loc = get_turf(user)
user.put_in_hands(tank)
src.tank = null
if(!removing)
if(src.tank)
user << "<span class='warning'>\The [src] already has a tank.</span>"
to_chat(user, "<span class='warning'>\The [src] already has a tank.</span>")
return
if(!user.transferItemToLoc(thetank, src))
return
user << "<span class='notice'>You hook \the [thetank] up to \the [src].</span>"
to_chat(user, "<span class='notice'>You hook \the [thetank] up to \the [src].</span>")
src.tank = thetank
src.update_icons()