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

Clean up a bunch of undefined arg runtimes

Browse Source
This commit is contained in:
oranges
2018-01-08 15:52:56 +13:00
committed by CitadelStationBot
parent 1f65e222b7
commit 1e9598dfbd
24 changed files with 116 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/dead/observer/observer.dm
+1 -1
View File
@@ -712,7 +712,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
@@ -722,7 +722,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
@@ -806,7 +806,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
@@ -874,7 +874,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))
@@ -1155,7 +1155,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
@@ -370,7 +370,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
@@ -840,7 +840,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
+88
View File
@@ -1,3 +1,4 @@
<<<<<<< HEAD
//Speech verbs.
/mob/verb/say_verb(message as text)
set name = "Say"
@@ -80,3 +81,90 @@
/mob/proc/lingcheck()
return LINGHIVE_NONE
=======
//Speech verbs.
/mob/verb/say_verb(message as text)
set name = "Say"
set category = "IC"
if(GLOB.say_disabled) //This is here to try to identify lag problems
to_chat(usr, "<span class='danger'>Speech is currently admin-disabled.</span>")
return
if(message)
say(message)
/mob/verb/whisper_verb(message as text)
set name = "Whisper"
set category = "IC"
if(GLOB.say_disabled) //This is here to try to identify lag problems
to_chat(usr, "<span class='danger'>Speech is currently admin-disabled.</span>")
return
whisper(message)
/mob/proc/whisper(message, datum/language/language=null)
say(message, language) //only living mobs actually whisper, everything else just talks
/mob/verb/me_verb(message as text)
set name = "Me"
set category = "IC"
if(GLOB.say_disabled) //This is here to try to identify lag problems
to_chat(usr, "<span class='danger'>Speech is currently admin-disabled.</span>")
return
message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
usr.emote("me",1,message)
/mob/proc/say_dead(var/message)
var/name = real_name
var/alt_name = ""
if(GLOB.say_disabled) //This is here to try to identify lag problems
to_chat(usr, "<span class='danger'>Speech is currently admin-disabled.</span>")
return
if(jobban_isbanned(src, "OOC"))
to_chat(src, "<span class='danger'>You have been banned from deadchat.</span>")
return
if (src.client)
if(src.client.prefs.muted & MUTE_DEADCHAT)
to_chat(src, "<span class='danger'>You cannot talk in deadchat (muted).</span>")
return
if(src.client.handle_spam_prevention(message,MUTE_DEADCHAT))
return
var/mob/dead/observer/O = src
if(isobserver(src) && O.deadchat_name)
name = "[O.deadchat_name]"
else
if(mind && mind.name)
name = "[mind.name]"
else
name = real_name
if(name != real_name)
alt_name = " (died as [real_name])"
var/K
if(key)
K = src.key
message = src.say_quote(message, get_spans())
var/rendered = "<span class='game deadsay'><span class='prefix'>DEAD:</span> <span class='name'>[name]</span>[alt_name] <span class='message'>[message]</span></span>"
deadchat_broadcast(rendered, follow_target = src, speaker_key = K)
/mob/proc/check_emote(message)
if(copytext(message, 1, 2) == "*")
emote(copytext(message, 2))
return 1
/mob/proc/hivecheck()
return 0
/mob/proc/lingcheck()
return LINGHIVE_NONE
>>>>>>> c8ad5a6... Clean up a bunch of undefined arg runtimes (#34105)