Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

(Finished) Assembly System #12264

Closed
wants to merge 38 commits into from
Closed

(Finished) Assembly System #12264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
d6c05ce
Intelligun - https://baystation12.net/forums/threads/prototype-weapon…
Esoudiere Feb 17, 2016
4587aeb
Fixed some travis errors..
Esoudiere Feb 17, 2016
0a8ab80
Fixed type errors in map
Esoudiere Feb 17, 2016
94b2135
Assumed .dme wasn't needed. Apparently it is?
Esoudiere Feb 17, 2016
cde2725
Renamed .dme (this is fun)
Esoudiere Feb 17, 2016
f94af65
Attempt to fix travis explosion
Esoudiere Feb 17, 2016
1b3229a
Trying yet again to find out the cause of travis errors
Esoudiere Feb 18, 2016
8994d90
Fixed indentation error
Esoudiere Feb 18, 2016
b1c9cb2
Added in missing z-levels.
Esoudiere Feb 18, 2016
c25c5a6
Fixed broken html tags
Esoudiere Feb 18, 2016
cb470cd
Fixed runtime.
Esoudiere Feb 18, 2016
9bd333c
-Fixed to use attach_container proc
Esoudiere Feb 18, 2016
c1bfb89
Type fix, forgot to compile to check.
Esoudiere Feb 18, 2016
cf82809
-Fixed various errors, courtesy of TechHead &
Esoudiere Feb 19, 2016
0796237
-Fixed relative pathing issues
Esoudiere Feb 19, 2016
bea858e
-Removed a colon I missed
Esoudiere Feb 20, 2016
bd82de5
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 in…
Esoudiere Feb 21, 2016
53dcb5b
Other files.
Esoudiere Feb 19, 2016
57886c2
Merging
Esoudiere Feb 23, 2016
bc860fe
Base Implementation(Will Not Compile)
Esoudiere Feb 23, 2016
13bdc38
Map Changes(Will Not Compile)
Esoudiere Feb 23, 2016
00feef2
Additional Implementation(Will Not Compile)
Esoudiere Feb 23, 2016
c58aaa7
Mass type changes
Esoudiere Feb 23, 2016
4de60a2
Finishing Implementation
Esoudiere Feb 23, 2016
1649f4a
Merge branch 'dev' into AssemblySystem
Esoudiere Feb 23, 2016
3d9ae09
Bug Bash
Esoudiere Feb 23, 2016
7926ce8
Research Design Error
Esoudiere Feb 23, 2016
f085a6a
Adds in ability to build assembly parts
Esoudiere Feb 23, 2016
71972a0
Fixed incorrect chemical id
Esoudiere Feb 23, 2016
e4e4c36
Made NanoUI much prettier
Esoudiere Mar 1, 2016
33e32cf
General Optimisations
Esoudiere Mar 3, 2016
d1489ab
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 in…
Esoudiere Mar 3, 2016
1ab2212
Removed legacy grenades
Esoudiere Mar 5, 2016
1c1879a
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 in…
Esoudiere Mar 6, 2016
ad2e8e2
Fixing merge conflicts
Esoudiere Mar 6, 2016
8fbd57a
Updating health analyzer.
Esoudiere Mar 7, 2016
278df95
Fixed extra HTML tag
Esoudiere Mar 7, 2016
4d8d16c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 in…
Esoudiere Mar 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
70 changes: 60 additions & 10 deletions baystation12.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@
#include "code\datums\wires\airlock.dm"
#include "code\datums\wires\alarm.dm"
#include "code\datums\wires\apc.dm"
#include "code\datums\wires\assembly.dm"
#include "code\datums\wires\autolathe.dm"
#include "code\datums\wires\camera.dm"
#include "code\datums\wires\explosive.dm"
Expand Down Expand Up @@ -592,7 +593,6 @@
#include "code\game\objects\items\devices\t_scanner.dm"
#include "code\game\objects\items\devices\taperecorder.dm"
#include "code\game\objects\items\devices\traitordevices.dm"
#include "code\game\objects\items\devices\transfer_valve.dm"
#include "code\game\objects\items\devices\uplink.dm"
#include "code\game\objects\items\devices\uplink_random_lists.dm"
#include "code\game\objects\items\devices\violin.dm"
Expand Down Expand Up @@ -679,14 +679,6 @@
#include "code\game\objects\items\weapons\circuitboards\machinery\shieldgen.dm"
#include "code\game\objects\items\weapons\circuitboards\machinery\telecomms.dm"
#include "code\game\objects\items\weapons\circuitboards\machinery\unary_atmos.dm"
#include "code\game\objects\items\weapons\grenades\anti_photon_grenade.dm"
#include "code\game\objects\items\weapons\grenades\chem_grenade.dm"
#include "code\game\objects\items\weapons\grenades\emgrenade.dm"
#include "code\game\objects\items\weapons\grenades\explosive.dm"
#include "code\game\objects\items\weapons\grenades\flashbang.dm"
#include "code\game\objects\items\weapons\grenades\grenade.dm"
#include "code\game\objects\items\weapons\grenades\smokebomb.dm"
#include "code\game\objects\items\weapons\grenades\spawnergrenade.dm"
#include "code\game\objects\items\weapons\implants\implant.dm"
#include "code\game\objects\items\weapons\implants\implantcase.dm"
#include "code\game\objects\items\weapons\implants\implantchair.dm"
Expand Down Expand Up @@ -923,18 +915,73 @@
#include "code\modules\alarm\fire_alarm.dm"
#include "code\modules\alarm\motion_alarm.dm"
#include "code\modules\alarm\power_alarm.dm"
#include "code\modules\assembly\access_checker.dm"
#include "code\modules\assembly\assembly.dm"
#include "code\modules\assembly\bomb.dm"
#include "code\modules\assembly\assembly_types.dm"
#include "code\modules\assembly\button.dm"
#include "code\modules\assembly\card_reader.dm"
#include "code\modules\assembly\chem_mixer.dm"
#include "code\modules\assembly\clamp.dm"
#include "code\modules\assembly\data_buffer.dm"
#include "code\modules\assembly\data_receiver.dm"
#include "code\modules\assembly\data_relay.dm"
#include "code\modules\assembly\data_sender.dm"
#include "code\modules\assembly\data_wireless.dm"
#include "code\modules\assembly\dice.dm"
#include "code\modules\assembly\disposal_chute.dm"
#include "code\modules\assembly\disposal_pad.dm"
#include "code\modules\assembly\eftpos.dm"
#include "code\modules\assembly\electric_lock.dm"
#include "code\modules\assembly\emexplosive.dm"
#include "code\modules\assembly\explosive.dm"
#include "code\modules\assembly\flash.dm"
#include "code\modules\assembly\flashexplosive.dm"
#include "code\modules\assembly\gps.dm"
#include "code\modules\assembly\helpers.dm"
#include "code\modules\assembly\holder.dm"
#include "code\modules\assembly\igniter.dm"
#include "code\modules\assembly\infrared.dm"
#include "code\modules\assembly\keypad.dm"
#include "code\modules\assembly\logic_circuits.dm"
#include "code\modules\assembly\mousetrap.dm"
#include "code\modules\assembly\paper_printer.dm"
#include "code\modules\assembly\paper_scanner.dm"
#include "code\modules\assembly\power_bank.dm"
#include "code\modules\assembly\power_meter.dm"
#include "code\modules\assembly\power_sink.dm"
#include "code\modules\assembly\pressure_clamp.dm"
#include "code\modules\assembly\pressure_meter.dm"
#include "code\modules\assembly\pressure_plate.dm"
#include "code\modules\assembly\proximity.dm"
#include "code\modules\assembly\radio.dm"
#include "code\modules\assembly\repeater.dm"
#include "code\modules\assembly\scanners.dm"
#include "code\modules\assembly\screen.dm"
#include "code\modules\assembly\shock_kit.dm"
#include "code\modules\assembly\shocker.dm"
#include "code\modules\assembly\signaler.dm"
#include "code\modules\assembly\speaker.dm"
#include "code\modules\assembly\strong_explosive.dm"
#include "code\modules\assembly\switch.dm"
#include "code\modules\assembly\syringe.dm"
#include "code\modules\assembly\target_control.dm"
#include "code\modules\assembly\target_finder.dm"
#include "code\modules\assembly\timer.dm"
#include "code\modules\assembly\transfer_valve.dm"
#include "code\modules\assembly\valve.dm"
#include "code\modules\assembly\voice.dm"
#include "code\modules\assembly\wire_safety.dm"
#include "code\modules\assembly\premade\bomb.dm"
#include "code\modules\assembly\premade\c4.dm"
#include "code\modules\assembly\premade\flash.dm"
#include "code\modules\assembly\premade\health_scanner.dm"
#include "code\modules\assembly\premade\grenade\anti_photon.dm"
#include "code\modules\assembly\premade\grenade\chem_grenade.dm"
#include "code\modules\assembly\premade\grenade\emgrenade.dm"
#include "code\modules\assembly\premade\grenade\flashbang.dm"
#include "code\modules\assembly\premade\grenade\grenade.dm"
#include "code\modules\assembly\premade\grenade\smokebomb.dm"
#include "code\modules\assembly\premade\grenade\spawnergrenade.dm"
#include "code\modules\awaymissions\bluespaceartillery.dm"
#include "code\modules\awaymissions\corpse.dm"
#include "code\modules\awaymissions\exile.dm"
Expand Down Expand Up @@ -1611,6 +1658,9 @@
#include "code\modules\projectiles\guns\energy.dm"
#include "code\modules\projectiles\guns\launcher.dm"
#include "code\modules\projectiles\guns\projectile.dm"
#include "code\modules\projectiles\guns\energy\advanced-control.dm"
#include "code\modules\projectiles\guns\energy\advanced-tools.dm"
#include "code\modules\projectiles\guns\energy\advanced.dm"
#include "code\modules\projectiles\guns\energy\laser.dm"
#include "code\modules\projectiles\guns\energy\nuclear.dm"
#include "code\modules\projectiles\guns\energy\pulse.dm"
Expand Down
18 changes: 9 additions & 9 deletions code/datums/supplypacks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/specialops
name = "Special Ops supplies"
contains = list(/obj/item/weapon/storage/box/emps,
/obj/item/weapon/grenade/smokebomb,
/obj/item/weapon/grenade/smokebomb,
/obj/item/weapon/grenade/smokebomb,
/obj/item/device/assembly_holder/grenade/smokebomb,
/obj/item/device/assembly_holder/grenade/smokebomb,
/obj/item/device/assembly_holder/grenade/smokebomb,
/obj/item/weapon/pen/reagent/paralysis,
/obj/item/weapon/grenade/chem_grenade/incendiary)
/obj/item/device/assembly_holder/grenade/chem_grenade/incendiary)
cost = 20
containertype = /obj/structure/closet/crate
containername = "\improper Special Ops crate"
Expand Down Expand Up @@ -227,9 +227,9 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/obj/item/device/lightreplacer,
/obj/item/weapon/reagent_containers/spray/cleaner,
/obj/item/weapon/reagent_containers/glass/rag,
/obj/item/weapon/grenade/chem_grenade/cleaner,
/obj/item/weapon/grenade/chem_grenade/cleaner,
/obj/item/weapon/grenade/chem_grenade/cleaner,
/obj/item/device/assembly_holder/grenade/chem_grenade/cleaner,
/obj/item/device/assembly_holder/grenade/chem_grenade/cleaner,
/obj/item/device/assembly_holder/grenade/chem_grenade/cleaner,
/obj/structure/mopbucket)
cost = 10
containertype = /obj/structure/closet/crate
Expand Down Expand Up @@ -371,8 +371,8 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/obj/item/weapon/reagent_containers/spray/plantbgone,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas,
/obj/item/weapon/grenade/chem_grenade/antiweed,
/obj/item/weapon/grenade/chem_grenade/antiweed)
/obj/item/device/assembly_holder/grenade/chem_grenade/antiweed,
/obj/item/device/assembly_holder/grenade/chem_grenade/antiweed)
cost = 25
containertype = /obj/structure/closet/crate/hydroponics
containername = "\improper Weed control crate"
Expand Down