cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-16 09:34:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

Browse Source 
Conflicts:
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/grenades.dm
	code/game/objects/items/weapons/implants/implant.dm
	code/game/objects/radio/headset.dm
	code/game/objects/radio/radio.dm
	code/modules/assembly/assembly.dm
	code/modules/assembly/holder.dm
	code/modules/clothing/glasses.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/paperwork/paper.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
	icons/mob/suit.dmi
This commit is contained in:
Erthilo
2012-05-31 15:09:35 +01:00
parent b409a84f2d 28bc3fa766
commit 8e72965077
189 changed files with 2489 additions and 1543 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/banjob.dm
+4 -3
View File
@@ -1,6 +1,7 @@
var
jobban_runonce // Updates legacy bans with new info
jobban_keylist[0] //to store the keys & ranks
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
var/jobban_runonce // Updates legacy bans with new info
var/jobban_keylist[0] //to store the keys & ranks
/proc/jobban_fullban(mob/M, rank, reason)
if (!M || !M.key) return