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

Merge branch 'upstream/development' into development

Browse Source 
# Conflicts:
#	code/_helpers/time.dm
#	code/game/objects/items/devices/floor_painter.dm
#	code/game/objects/items/stacks/medical.dm
#	code/global.dm
#	code/modules/cargo/randomstock.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/paperwork/faxmachine.dm
This commit is contained in:
skull132
2016-12-18 01:06:45 +02:00
parent 30fbc7a67b 355504dabb
commit 9b094ad0eb
37 changed files with 543 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/supplypacks.dm
+29
View File
@@ -1669,3 +1669,32 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
containername = "security magnetic locks"
access = access_security
group = "Security"
/datum/supply_packs/randomised/glowsticks
name = "Glowsticks crate"
num_contained = 4
contains = list(/obj/item/device/flashlight/glowstick,
/obj/item/device/flashlight/glowstick/red,
/obj/item/device/flashlight/glowstick/blue,
/obj/item/device/flashlight/glowstick/orange,
/obj/item/device/flashlight/glowstick/yellow)
cost = 25
containertype = /obj/structure/closet/crate
containername = "glowsticks crate"
group = "Operations"
/datum/supply_packs/randomised/illegalguns
name = "Illegal weapons crate"
num_contained = 2
contains = list(/obj/item/weapon/gun/projectile/automatic/mini_uzi,
/obj/item/weapon/gun/projectile/boltaction,
/obj/item/weapon/gun/projectile/silenced,
/obj/item/weapon/gun/projectile/pirate,
/obj/item/weapon/gun/projectile/revolver/derringer,
/obj/item/weapon/gun/projectile/dragunov,
/obj/item/weapon/gun/energy/retro)
cost = 120
containertype = /obj/structure/closet/crate
containername = "Unlabeled crate"
contraband = 1
group = "Security"