cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 22:12:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ship_and_stuff

Browse Source 
# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_eyes.dm
This commit is contained in:
alberyk
2022-03-04 14:00:19 -03:00
parent 93dd55a107 c41b6ee7ba
commit f0e32eec35
173 changed files with 1693 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/ghostroles/spawner/human/emergencypod.dm
+1 -1
View File
@@ -466,4 +466,4 @@
if(W)
W.handle_item_insertion(passport)
burglars.add_antagonist(H.mind, TRUE, TRUE, FALSE, TRUE)
burglars.add_antagonist(H.mind, TRUE, TRUE, FALSE, TRUE, TRUE)
code/modules/ghostroles/spawner/human/human.dm
+1 -1
View File
@@ -36,7 +36,7 @@
pick_message = "[pick_message] Auto Prefix: \"[mob_name_prefix]\" "
if(mob_name_suffix)
pick_message = "[pick_message] Auto Suffix: \"[mob_name_suffix]\" "
mname = sanitizeSafe(input(user, pick_message, "Name for a [species] (without prefix/suffix)"))
mname = sanitizeName(sanitize_readd_odd_symbols(sanitizeSafe(input(user, pick_message, "Name for a [species] (without prefix/suffix)"))))
if(!length(mname))
if(mob_name_prefix || mob_name_suffix)