cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev-freeze

Browse Source 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
	code/game/objects/structures/crates_lockers/largecrate.dm
This commit is contained in:
PsiOmega
2015-09-13 10:44:06 +02:00
parent 1bbfc73c69 26d0a35699
commit 830d2feb0d
7 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/_helpers/unsorted.dm
View File

@@ -342,7 +342,7 @@ Turf and target are seperate in case you want to teleport some distance from a t
//Picks a string of symbols to display as the law number for hacked or ion laws
/proc/ionnum()
return "[pick("!","@","#","$","%","^","&","*")][pick("!","@","#","$","%","^","&","*")][pick("!","@","#","$","%","^","&","*")][pick("!","@","#","$","%","^","&","*")]"
return "[pick("1","2","3","4","5","6","7","8","9","0")][pick("!","@","#","$","%","^","&","*")][pick("!","@","#","$","%","^","&","*")][pick("!","@","#","$","%","^","&","*")]"
//When an AI is activated, it can choose from a list of non-slaved borgs to have as a slave.
/proc/freeborg()