cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes proc arguments

Browse Source
This commit is contained in:
Firecage
2015-07-15 23:52:35 +02:00
parent 6a0faa4ff6
commit 4688c2c969
832 changed files with 3721 additions and 3664 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/effect_system/effects_foam.dm
+11 -11
View File
@@ -71,7 +71,7 @@
return
spread_foam()
/obj/effect/effect/foam/proc/foam_mob(var/mob/living/L as mob)
/obj/effect/effect/foam/proc/foam_mob(mob/living/L)
if(lifetime<1)
return 0
if(!istype(L))
@@ -81,12 +81,12 @@
lifetime--
return 1
/obj/effect/effect/foam/Crossed(var/atom/movable/AM)
/obj/effect/effect/foam/Crossed(atom/movable/AM)
if(istype(AM, /mob/living/carbon))
var/mob/living/carbon/M = AM
M.slip(5, 2, src)
/obj/effect/effect/foam/metal/Crossed(var/atom/movable/AM)
/obj/effect/effect/foam/metal/Crossed(atom/movable/AM)
return
@@ -146,7 +146,7 @@
chemholder = null
return ..()
/datum/effect/effect/system/foam_spread/set_up(amt=5, loca, var/datum/reagents/carry = null)
/datum/effect/effect/system/foam_spread/set_up(amt=5, loca, datum/reagents/carry = null)
if(istype(loca, /turf/))
location = loca
else
@@ -155,7 +155,7 @@
amount = round(sqrt(amt / 2), 1)
carry.copy_to(chemholder, carry.total_volume)
/datum/effect/effect/system/foam_spread/metal/set_up(amt=5, loca, var/datum/reagents/carry = null, var/metaltype)
/datum/effect/effect/system/foam_spread/metal/set_up(amt=5, loca, datum/reagents/carry = null, metaltype)
..()
metal = metaltype
@@ -224,12 +224,12 @@
qdel(src)
/obj/structure/foamedmetal/attack_paw(var/mob/user)
/obj/structure/foamedmetal/attack_paw(mob/user)
attack_hand(user)
return
/obj/structure/foamedmetal/attack_animal(var/mob/living/simple_animal/user)
/obj/structure/foamedmetal/attack_animal(mob/living/simple_animal/user)
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(src)
if(user.environment_smash >= 1)
@@ -249,7 +249,7 @@
qdel(src)
return 1
/obj/structure/foamedmetal/attack_alien(var/mob/living/carbon/alien/humanoid/user)
/obj/structure/foamedmetal/attack_alien(mob/living/carbon/alien/humanoid/user)
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(src)
if(prob(75 - metal*25))
@@ -257,7 +257,7 @@
"<span class='danger'>You smash through the metal foam wall!</span>")
qdel(src)
/obj/structure/foamedmetal/attack_slime(var/mob/living/simple_animal/slime/user)
/obj/structure/foamedmetal/attack_slime(mob/living/simple_animal/slime/user)
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(src)
if(!user.is_adult)
@@ -268,13 +268,13 @@
"<span class='danger'>You smash through the metal foam wall!</span>")
qdel(src)
/obj/structure/foamedmetal/attack_hand(var/mob/user)
/obj/structure/foamedmetal/attack_hand(mob/user)
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(src)
user << "<span class='warning'>You hit the metal foam but bounce off it!</span>"
/obj/structure/foamedmetal/attackby(var/obj/item/I, var/mob/user, params)
/obj/structure/foamedmetal/attackby(obj/item/I, mob/user, params)
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(src)
if (istype(I, /obj/item/weapon/grab))
code/game/objects/effects/effect_system/effects_smoke.dm
+7 -7
View File
@@ -18,7 +18,7 @@
var/direction
/obj/effect/effect/smoke/proc/fade_out(var/frames = 16)
/obj/effect/effect/smoke/proc/fade_out(frames = 16)
if(alpha == 0) //Handle already transparent case
return
if(frames == 0)
@@ -55,12 +55,12 @@
steps--
return 1
/obj/effect/effect/smoke/Crossed(mob/living/M as mob)
/obj/effect/effect/smoke/Crossed(mob/living/M)
if(!istype(M))
return
smoke_mob(M)
/obj/effect/effect/smoke/proc/smoke_mob(mob/living/carbon/M as mob)
/obj/effect/effect/smoke/proc/smoke_mob(mob/living/carbon/M)
if(!istype(M))
return 0
if(lifetime<1)
@@ -122,7 +122,7 @@
for(var/mob/living/carbon/M in range(1,src))
smoke_mob(M)
/obj/effect/effect/smoke/bad/smoke_mob(mob/living/carbon/M as mob)
/obj/effect/effect/smoke/bad/smoke_mob(mob/living/carbon/M)
if(..())
M.drop_item()
M.adjustOxyLoss(1)
@@ -168,7 +168,7 @@
if(hit)
lifetime++ //this is so the decrease from mobs hit and the natural decrease don't cumulate.
/obj/effect/effect/smoke/chem/smoke_mob(mob/living/carbon/M as mob)
/obj/effect/effect/smoke/chem/smoke_mob(mob/living/carbon/M)
if(lifetime<1)
return 0
if(!istype(M))
@@ -196,7 +196,7 @@
..()
return QDEL_HINT_PUTINPOOL
/datum/effect/effect/system/smoke_spread/chem/set_up(var/datum/reagents/carry = null, n = 5, c = 0, loca, direct, silent = 0)
/datum/effect/effect/system/smoke_spread/chem/set_up(datum/reagents/carry = null, n = 5, c = 0, loca, direct, silent = 0)
if(n > 20)
n = 20
number = n
@@ -282,7 +282,7 @@
for(var/mob/living/carbon/M in range(1,src))
smoke_mob(M)
/obj/effect/effect/smoke/sleeping/smoke_mob(mob/living/carbon/M as mob)
/obj/effect/effect/smoke/sleeping/smoke_mob(mob/living/carbon/M)
if(..())
if(M.internal != null || (M.wear_mask && (M.wear_mask.flags & BLOCK_GAS_SMOKE_EFFECT)))
return