Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] OpenDream TypeMaker Prep #2301

Merged
merged 1 commit into from
Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions code/__DEFINES/procpath.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
// below, their accesses are optimized away.

/// A text string of the verb's name.
var/name as text
var/name = null as text|null
/// The verb's help text or description.
var/desc as text
var/desc = null as text|null
/// The category or tab the verb will appear in.
var/category as text
var/category = null as text|null
/// Only clients/mobs with `see_invisibility` higher can use the verb.
var/invisibility as num
var/invisibility = null as num|null
/// Whether or not the verb appears in statpanel and commandbar when you press space
var/hidden as num
var/hidden = null as num|null
2 changes: 1 addition & 1 deletion code/modules/mob/living/living.dm
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@
log_message("points at [pointing_at]", LOG_EMOTE)
visible_message("<span class='infoplain'>[span_name("[src]")] points at [pointing_at].</span>", span_notice("You point at [pointing_at]."))

/mob/living/verb/succumb(whispered as null)
/mob/living/verb/succumb(whispered as num|null)
set hidden = TRUE
if (!CAN_SUCCUMB(src))
if(HAS_TRAIT(src, TRAIT_SUCCUMB_OVERRIDE))
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/mob_transformation_simple.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//This proc is the most basic of the procs. All it does is make a new mob on the same tile and transfer over a few variables.
//Returns the new mob
//Note that this proc does NOT do MMI related stuff!
/mob/proc/change_mob_type(new_type = null, turf/location = null, new_name = null as text, delete_old_mob = FALSE)
/mob/proc/change_mob_type(new_type = null, turf/location = null, new_name = null as text|null, delete_old_mob = FALSE)

if(isnewplayer(src))
to_chat(usr, span_danger("Cannot convert players who have not entered yet."))
Expand Down
2 changes: 1 addition & 1 deletion modular_nova/modules/mentor/code/mentorhelp.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/client/verb/mentorhelp(msg as text)
/client/verb/mentorhelp(msg as text|null)
set category = "Mentor"
set name = "Mentorhelp"

Expand Down
2 changes: 1 addition & 1 deletion modular_nova/modules/mentor/code/mentorsay.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/client/proc/cmd_mentor_say(msg as text)
/client/proc/cmd_mentor_say(msg as text|null)
set category = "Mentor"
set name = "Msay" //Gave this shit a shorter name so you only have to time out "msay" rather than "mentor say" to use it --NeoFite
set hidden = 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
room.send_message(message, src, FALSE)
return TRUE

/mob/living/soulcatcher_soul/me_verb(message as text)
/mob/living/soulcatcher_soul/me_verb(message as text|null)
message = trim(copytext_char(sanitize(message), 1, MAX_MESSAGE_LEN))
if(!message)
return FALSE
Expand Down
4 changes: 2 additions & 2 deletions modular_nova/modules/panicbunker/code/panicbunker.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GLOBAL_LIST_EMPTY(bunker_passthrough)

/client/proc/addbunkerbypass(ckeytobypass as text)
/client/proc/addbunkerbypass(ckeytobypass as text|null)
set category = "Admin"
set name = "Add PB Bypass"
set desc = "Allows a given ckey to connect despite the panic bunker for a given round."
Expand All @@ -14,7 +14,7 @@ GLOBAL_LIST_EMPTY(bunker_passthrough)
log_admin("[key_name(usr)] has added [ckeytobypass] to the current round's bunker bypass list.")
message_admins("[key_name_admin(usr)] has added [ckeytobypass] to the current round's bunker bypass list.")

/client/proc/revokebunkerbypass(ckeytobypass as text)
/client/proc/revokebunkerbypass(ckeytobypass as text|null)
set category = "Admin"
set name = "Revoke PB Bypass"
set desc = "Revoke's a ckey's permission to bypass the panic bunker for a given round."
Expand Down
4 changes: 2 additions & 2 deletions modular_nova/modules/verbs/code/looc.dm
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/client/verb/looc(msg as text)
/client/verb/looc(msg as text|null)
set name = "LOOC"
set desc = "Local OOC, seen only by those in view."
set category = "OOC"

looc_message(msg)

/client/verb/looc_wallpierce(msg as text)
/client/verb/looc_wallpierce(msg as text|null)
set name = "LOOC (Wallpierce)"
set desc = "Local OOC, seen by anyone within 7 tiles of you."
set category = "OOC"
Expand Down
Loading