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

Clean up a bunch of undefined arg runtimes (#34105)

Browse Source 
* Clean up a bunch of undefined arg runtimes

Ensure subtypes have the appropriate arguments, do a bit of code cleanup
and remove some uneeded emote procs that also caused runtimes

* Fix up all calls to canUseTopic, add the dexterity flag

* Runtime with missing force argument in borg unbuckle mob
This commit is contained in:
oranges
2018-01-07 21:52:56 -05:00
committed by ShizCalev
parent ca1da30f55
commit c8ad5a6314
24 changed files with 28 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/dead/observer/observer.dm
+1 -1
View File
@@ -711,7 +711,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
update_icon()
/mob/dead/observer/canUseTopic(atom/movable/AM,be_close = FALSE)
/mob/dead/observer/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE)
return IsAdminGhost(usr)
/mob/dead/observer/is_literate()
code/modules/mob/emote.dm
+1 -1
View File
@@ -1,5 +1,5 @@
//The code execution of the emote datum is located at code/datums/emotes.dm
/mob/emote(act, m_type = null, message = null)
/mob/proc/emote(act, m_type = null, message = null)
act = lowertext(act)
var/param = message
var/custom_param = findchar(act, " ")
code/modules/mob/living/carbon/human/human.dm
+1 -1
View File
@@ -717,7 +717,7 @@
remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, "#000000")
cut_overlay(MA)
/mob/living/carbon/human/canUseTopic(atom/movable/M, be_close = 0)
/mob/living/carbon/human/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE)
if(incapacitated() || lying )
return
if(!Adjacent(M) && (M.loc != src))
code/modules/mob/living/living.dm
+1 -1
View File
@@ -793,7 +793,7 @@
visible_message("<span class='notice'>[user] butchers [src].</span>")
gib(0, 0, 1)
/mob/living/canUseTopic(atom/movable/M, be_close = 0, no_dextery = 0)
/mob/living/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE)
if(incapacitated())
return
if(no_dextery)
code/modules/mob/living/silicon/ai/ai.dm
+1 -1
View File
@@ -800,7 +800,7 @@
return TRUE
return ..()
/mob/living/silicon/ai/canUseTopic(atom/movable/M, be_close = FALSE)
/mob/living/silicon/ai/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE)
if(control_disabled || incapacitated())
return FALSE
if(be_close && !in_range(M, src))
code/modules/mob/living/silicon/pai/pai.dm
+1 -1
View File
@@ -184,7 +184,7 @@
// See software.dm for Topic()
/mob/living/silicon/pai/canUseTopic(atom/movable/M)
/mob/living/silicon/pai/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE)
return TRUE
/mob/proc/makePAI(delold)
code/modules/mob/living/silicon/robot/robot.dm
+2 -2
View File
@@ -851,7 +851,7 @@
if(DISCONNECT) //Tampering with the wires
to_chat(connected_ai, "<br><br><span class='notice'>NOTICE - Remote telemetry lost with [name].</span><br>")
/mob/living/silicon/robot/canUseTopic(atom/movable/M, be_close = 0)
/mob/living/silicon/robot/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE)
if(stat || lockcharge || low_power_mode)
return
if(be_close && !in_range(M, src))
@@ -1131,7 +1131,7 @@
return
. = ..(M, force, check_loc)
/mob/living/silicon/robot/unbuckle_mob(mob/user)
/mob/living/silicon/robot/unbuckle_mob(mob/user, force=FALSE)
if(iscarbon(user))
GET_COMPONENT(riding_datum, /datum/component/riding)
if(istype(riding_datum))
code/modules/mob/living/simple_animal/friendly/gondola.dm
+1 -4
View File
@@ -56,10 +56,7 @@
/mob/living/simple_animal/pet/gondola/IsVocal() //Gondolas are the silent walker.
return FALSE
/mob/living/simple_animal/pet/gondola/emote()
return
#undef GONDOLA_HEIGHT
#undef GONDOLA_COLOR
#undef GONDOLA_MOUSTACHE
#undef GONDOLA_EYES
#undef GONDOLA_EYES
code/modules/mob/living/simple_animal/hostile/hostile.dm
+1 -1
View File
@@ -346,7 +346,7 @@
if(casingtype)
var/obj/item/ammo_casing/casing = new casingtype(startloc)
playsound(src, projectilesound, 100, 1)
casing.fire_casing(targeted_atom, src, null, null, null, zone_override = ran_zone())
casing.fire_casing(targeted_atom, src, null, null, null, ran_zone())
else if(projectiletype)
var/obj/item/projectile/P = new projectiletype(startloc)
playsound(src, projectilesound, 100, 1)
code/modules/mob/living/simple_animal/simple_animal.dm
+1 -1
View File
@@ -367,7 +367,7 @@
if(target)
return new childspawn(target)
/mob/living/simple_animal/canUseTopic(atom/movable/M, be_close = 0, no_dextery = 0)
/mob/living/simple_animal/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE)
if(incapacitated())
return 0
if(no_dextery || dextrous)
code/modules/mob/mob.dm
+1 -1
View File
@@ -833,7 +833,7 @@
return 0
//Can the mob use Topic to interact with machines
/mob/proc/canUseTopic()
/mob/proc/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE)
return
/mob/proc/faction_check_mob(mob/target, exact_match)
code/modules/mob/say.dm
-3
View File
@@ -78,9 +78,6 @@
emote(copytext(message, 2))
return 1
/mob/proc/emote(var/act)
return
/mob/proc/hivecheck()
return 0
code/modules/modular_computers/computers/item/processor.dm
+1 -1
View File
@@ -44,7 +44,7 @@
return machinery_computer.update_icon()
// This thing is not meant to be used on it's own, get topic data from our machinery owner.
//obj/item/device/modular_computer/processor/canUseTopic(user, state)
//obj/item/device/modular_computer/processor/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE)
// if(!machinery_computer)
// return 0
code/modules/projectiles/ammunition/energy.dm
+1 -1
View File
@@ -14,7 +14,7 @@
e_cost = 0
var/list/projectile_vars = list()
/obj/item/ammo_casing/energy/chameleon/ready_proj()
/obj/item/ammo_casing/energy/chameleon/ready_proj(atom/target, mob/living/user, quiet, zone_override = "")
. = ..()
if(!BB)
newshot()
code/modules/projectiles/firing.dm
+1 -1
View File
@@ -20,7 +20,7 @@
update_icon()
return 1
/obj/item/ammo_casing/proc/ready_proj(atom/target, mob/living/user, quiet, zone_override)
/obj/item/ammo_casing/proc/ready_proj(atom/target, mob/living/user, quiet, zone_override = "")
if (!BB)
return
BB.original = target
code/modules/projectiles/gun.dm
+2 -2
View File
@@ -203,7 +203,7 @@
/obj/item/gun/proc/recharge_newshot()
return
/obj/item/gun/proc/process_burst(mob/living/user, atom/target, message = TRUE, params, zone_override, sprd = 0, randomized_gun_spread = 0, randomized_bonus_spread = 0, rand_spr = 0, iteration = 0)
/obj/item/gun/proc/process_burst(mob/living/user, atom/target, message = TRUE, params=null, zone_override = "", sprd = 0, randomized_gun_spread = 0, randomized_bonus_spread = 0, rand_spr = 0, iteration = 0)
if(!user || !firing_burst)
firing_burst = FALSE
return FALSE
@@ -236,7 +236,7 @@
update_icon()
return TRUE
/obj/item/gun/proc/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = TRUE, params, zone_override, bonus_spread = 0)
/obj/item/gun/proc/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
add_fingerprint(user)
if(semicd)
code/modules/projectiles/guns/ballistic/laser_gatling.dm
+1 -1
View File
@@ -129,7 +129,7 @@
else
qdel(src)
/obj/item/gun/ballistic/minigun/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params, zone_override)
/obj/item/gun/ballistic/minigun/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
if(ammo_pack)
if(ammo_pack.overheat < ammo_pack.overheat_max)
ammo_pack.overheat += burst_size
code/modules/projectiles/guns/ballistic/revolver.dm
+1 -1
View File
@@ -97,7 +97,7 @@
"The Peacemaker" = "detective_peacemaker"
)
/obj/item/gun/ballistic/revolver/detective/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params, zone_override = "")
/obj/item/gun/ballistic/revolver/detective/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
if(magazine.caliber != initial(magazine.caliber))
if(prob(70 - (magazine.ammo_count() * 10))) //minimum probability of 10, maximum of 60
playsound(user, fire_sound, 50, 1)
code/modules/projectiles/guns/beam_rifle.dm
+2 -2
View File
@@ -383,8 +383,8 @@
structure_piercing = BR.structure_piercing
structure_bleed_coeff = BR.structure_bleed_coeff
/obj/item/ammo_casing/energy/beam_rifle/ready_proj(atom/target, mob/living/user, quiet, zone_override)
. = ..(target, user, quiet, zone_override)
/obj/item/ammo_casing/energy/beam_rifle/ready_proj(atom/target, mob/living/user, quiet, zone_override = "")
. = ..()
var/obj/item/projectile/beam/beam_rifle/hitscan/HS_BB = BB
if(!istype(HS_BB))
return
code/modules/projectiles/guns/energy.dm
+2 -2
View File
@@ -102,12 +102,12 @@
chambered = null //either way, released the prepared shot
recharge_newshot() //try to charge a new shot
/obj/item/gun/energy/process_fire()
/obj/item/gun/energy/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
if(!chambered && can_shoot())
process_chamber() // If the gun was drained and then recharged, load a new shot.
return ..()
/obj/item/gun/energy/process_burst()
/obj/item/gun/energy/process_burst(mob/living/user, atom/target, message = TRUE, params = null, zone_override="", sprd = 0, randomized_gun_spread = 0, randomized_bonus_spread = 0, rand_spr = 0, iteration = 0)
if(!chambered && can_shoot())
process_chamber() // Ditto.
return ..()
code/modules/projectiles/guns/magic/staff.dm
+2 -2
View File
@@ -45,9 +45,9 @@
/obj/item/projectile/magic/death, /obj/item/projectile/magic/teleport, /obj/item/projectile/magic/door, /obj/item/projectile/magic/aoe/fireball,
/obj/item/projectile/magic/spellblade, /obj/item/projectile/magic/arcane_barrage)
/obj/item/gun/magic/staff/chaos/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params, zone_override, bonus_spread = 0)
/obj/item/gun/magic/staff/chaos/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
chambered.projectile_type = pick(allowed_projectile_types)
. = ..(target, user, message, params, zone_override, bonus_spread)
. = ..()
/obj/item/gun/magic/staff/door
name = "staff of door creation"
code/modules/projectiles/guns/medbeam.dm
+1 -1
View File
@@ -41,7 +41,7 @@
on_beam_release(current_target)
current_target = null
/obj/item/gun/medbeam/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params, zone_override)
/obj/item/gun/medbeam/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
if(isliving(user))
add_fingerprint(user)