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

Merges birdboat survival boxes into mainline

Browse Source 
- Made new survival+radio boxes, and set Birdboat jobs to use them.
- Also deleted some unneeded lines in boxes.dm
This commit is contained in:
Jack Edge
2016-05-12 16:36:25 +01:00
parent 8fd21c79dc
commit 049d23cde9
4 changed files with 22 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/birdstation.dm
+1 -2
View File
@@ -31,7 +31,6 @@ A small map intended for lowpop(40 players and less).
#if !defined(MAP_OVERRIDE_FILES)
#define MAP_OVERRIDE_FILES
#include "map_files\BirdStation\telecomms.dm"
#include "map_files\BirdStation\misc.dm"
#include "map_files\BirdStation\job\job_changes.dm"
#include "map_files\BirdStation\job\removed_jobs.dm"
#endif
@@ -40,4 +39,4 @@ A small map intended for lowpop(40 players and less).
#warn a map has already been included, ignoring birdstation.
#endif
#endif
_maps/map_files/BirdStation/job/job_changes.dm
+7 -7
View File
@@ -6,7 +6,7 @@
supervisors = "the captain and the head of personnel"
/datum/outfit/job/New()
box = /obj/item/weapon/storage/box/birdsurv
box = /obj/item/weapon/storage/box/survival/radio
/datum/job/assistant // Here so assistant appears on the top of the select job list.
@@ -29,7 +29,7 @@
..()
/datum/outfit/job/hos/New()
box = /obj/item/weapon/storage/box/birdsec
box = /obj/item/weapon/storage/box/security/radio
/datum/job/officer/New()
..()
@@ -39,7 +39,7 @@
minimal_access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_maint_tunnels, access_morgue, access_weapons, access_forensics_lockers)
/datum/outfit/job/officer/New()
box = /obj/item/weapon/storage/box/birdsec
box = /obj/item/weapon/storage/box/security/radio
/datum/job/detective/New()
..()
@@ -47,7 +47,7 @@
minimal_access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_maint_tunnels, access_morgue, access_weapons, access_forensics_lockers)
/datum/outfit/job/detective/New()
box = /obj/item/weapon/storage/box/birdsec
box = /obj/item/weapon/storage/box/security/radio
//Medbay
@@ -69,7 +69,7 @@
minimal_access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_atmospherics, access_tcomsat)
/datum/outfit/job/engineer/New()
box = /obj/item/weapon/storage/box/birdeng
box = /obj/item/weapon/storage/box/engineer/radio
//Science
@@ -93,7 +93,7 @@
minimal_access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station, access_mineral_storeroom)
/datum/outfit/job/mining/New()
box = /obj/item/weapon/storage/box/birdeng
box = /obj/item/weapon/storage/box/engineer/radio
//Service
@@ -123,4 +123,4 @@
/datum/job/clown/New()
..()
supervisors = "nobody but yourself" //Honk
supervisors = "nobody but yourself" //Honk
_maps/map_files/BirdStation/misc.dm
-28
View File
@@ -1,28 +0,0 @@
//special birdstation survival boxes
/obj/item/weapon/storage/box/birdsurv/New()
..()
contents = list()
new /obj/item/clothing/mask/breath(src)
new /obj/item/weapon/tank/internals/emergency_oxygen(src)
new /obj/item/weapon/reagent_containers/hypospray/medipen(src)
new /obj/item/device/radio/off(src)
return
/obj/item/weapon/storage/box/birdeng/New()
..()
contents = list()
new /obj/item/clothing/mask/breath(src)
new /obj/item/weapon/tank/internals/emergency_oxygen/engi(src)
new /obj/item/weapon/reagent_containers/hypospray/medipen(src)
new /obj/item/device/radio/off(src)
return
/obj/item/weapon/storage/box/birdsec/New()
..()
contents = list()
new /obj/item/clothing/mask/gas/sechailer(src)
new /obj/item/weapon/tank/internals/emergency_oxygen(src)
new /obj/item/weapon/reagent_containers/hypospray/medipen(src)
new /obj/item/device/radio/off(src)
return
code/game/objects/items/weapons/storage/boxes.dm
+14 -6
View File
@@ -57,37 +57,45 @@
return ..()
/obj/item/weapon/storage/box/survival
// Ordinary survival box
/obj/item/weapon/storage/box/survival/New()
..()
new /obj/item/clothing/mask/breath(src)
new /obj/item/weapon/tank/internals/emergency_oxygen(src)
new /obj/item/weapon/reagent_containers/hypospray/medipen(src)
/obj/item/weapon/storage/box/engineer
/obj/item/weapon/storage/box/survival/radio/New()
..()
new /obj/item/device/radio/off(src)
// Engineer survival box
/obj/item/weapon/storage/box/engineer/New()
..()
new /obj/item/clothing/mask/breath(src)
new /obj/item/weapon/tank/internals/emergency_oxygen/engi(src)
new /obj/item/weapon/reagent_containers/hypospray/medipen(src)
/obj/item/weapon/storage/box/syndie
/obj/item/weapon/storage/box/engineer/radio/New()
..()
new /obj/item/device/radio/off(src)
// Syndie survival box
/obj/item/weapon/storage/box/syndie/New()
..()
new /obj/item/clothing/mask/gas/syndicate(src)
new /obj/item/weapon/tank/internals/emergency_oxygen/engi(src)
/obj/item/weapon/storage/box/security
// Security survival box
/obj/item/weapon/storage/box/security/New()
..()
new /obj/item/clothing/mask/gas/sechailer(src)
new /obj/item/weapon/tank/internals/emergency_oxygen(src)
new /obj/item/weapon/reagent_containers/hypospray/medipen(src)
/obj/item/weapon/storage/box/security/radio/New()
..()
new /obj/item/device/radio/off(src)
/obj/item/weapon/storage/box/gloves
name = "box of latex gloves"
desc = "Contains sterile latex gloves."