cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 06:00:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r

Browse Source 
Conflicts:
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/rechargestation.dm
	code/game/machinery/turrets.dm
	code/game/objects/structures/crates_lockers/closets.dm
	code/modules/research/circuitprinter.dm
This commit is contained in:
MrPerson
2014-03-08 22:03:03 -08:00
parent 1ff2cd3e92 f5e49728ac
commit 6b29fecda1
173 changed files with 2000 additions and 1539 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/WorkInProgress/Sigyn/Department Sec/jobs.dm
+1
View File
@@ -79,6 +79,7 @@ var/list/sec_departments = list("engineering", "supply", "medical", "science")
else
H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_in_backpack)
H.equip_to_slot_or_del(new /obj/item/weapon/melee/baton/loaded(H), slot_in_backpack)
var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
L.imp_in = H
L.implanted = 1