cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-26 10:03:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1537 from TurboCamel/master

Browse Source 
Fixed bugs with power control module supply pack and collectible hat crate
This commit is contained in:
Mloc
2012-07-29 05:50:14 -07:00
parent 35b1e7efd6 5734a2df15
commit fe4de6ac07
3 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/defines/obj/storage.dm
View File

@@ -535,6 +535,13 @@
icon_state = "circuit"
item_state = "syringe_kit"
/obj/item/weapon/storage/AirlockBox
name = "spare airlock electronics"
desc = "A box of spare airlock circuit boards."
icon = 'storage.dmi'
icon_state = "circuit"
item_state = "syringe_kit"
/obj/item/weapon/storage/toolbox/syndicate
name = "red and black toolbox"
desc = "An oddly coloured toolbox."

7
code/defines/obj/supplypacks.dm
View File

@@ -33,12 +33,13 @@
containername = "Empty Box crate"
/datum/supply_packs/pcm
name = "Power Control Module supplies"
name = "APC and Airlock Electronics crate"
contains = list("/obj/item/weapon/storage/PCMBox",
"/obj/item/weapon/storage/PCMBox")
"/obj/item/weapon/storage/AirlockBox")
cost = 25
containertype = "/obj/structure/closet/crate"
containername = "Power Control Module crate"
group = "Engineering"
/datum/supply_packs/body_bags
name = "Body Bag supplies"
@@ -764,6 +765,7 @@
containername = "Secruity Barriers crate"
group = "Security"
/*
/datum/supply_packs/randomised
var/num_contained = 3 //number of items picked to be contained in a randomised crate
contains = list("/obj/item/clothing/head/collectable/chef",
@@ -794,6 +796,7 @@
cost = 200
containertype = "/obj/structure/closet/crate"
containername = "Collectable hats crate! Brought to you by Bass.inc!"
*/
/datum/supply_packs/randomised/New()
var/list/tempContains = list()

26
code/game/objects/storage/storage.dm
View File

@@ -321,6 +321,32 @@
new /obj/item/weapon/reagent_containers/glass/bottle/ert/boost( src )
return
/obj/item/weapon/storage/PCMBox/New()
..()
contents = list()
sleep(1)
new /obj/item/weapon/module/power_control( src )
new /obj/item/weapon/module/power_control( src )
new /obj/item/weapon/module/power_control( src )
new /obj/item/weapon/module/power_control( src )
new /obj/item/weapon/module/power_control( src )
new /obj/item/weapon/module/power_control( src )
new /obj/item/weapon/module/power_control( src )
return
/obj/item/weapon/storage/AirlockBox/New()
..()
contents = list()
sleep(1)
new /obj/item/weapon/airlock_electronics( src )
new /obj/item/weapon/airlock_electronics( src )
new /obj/item/weapon/airlock_electronics( src )
new /obj/item/weapon/airlock_electronics( src )
new /obj/item/weapon/airlock_electronics( src )
new /obj/item/weapon/airlock_electronics( src )
new /obj/item/weapon/airlock_electronics( src )
return
/obj/item/weapon/storage/box/syndicate/New()
..()
switch (pickweight(list("bloodyspai" = 1, "stealth" = 1, "screwed" = 1, "guns" = 1, "freedom" = 1, "hacker" = 1, "lordsingulo" = 1)))