Zuhayr
c841db56b6
Merge branch 'mining' of https://github.com/Zuhayr/Baystation12 into dev
2014-06-11 09:24:28 +09:30
Zuhayr
5be9f0e12f
Merge branch 'mining' of https://github.com/Zuhayr/Baystation12 into dev
2014-06-11 09:15:28 +09:30
Zuhayr
9339b1235b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-06-11 09:14:13 +09:30
Zuhayr
9e7fe6d700
Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.
2014-06-11 01:14:38 +09:30
mwerezak
ed4fb8d3c6
Shuttles now dock on arrival and departure
...
Squashes 3 commits:
Shuttles now dock on arrival and departure
Adds docking controller to outpost, tweaks
Finishes off shuttle_console
Could use some cleanup, though.
Commented out the debug stuff.
2014-06-10 00:05:08 -04:00
mwerezak
b4bb8ab31d
Reworks shuttles to be more extensible
...
Kudos to Zuhayr for laying the groundwork for this.
2014-06-09 23:41:29 -04:00
mwerezak
0319c96502
Adds docking support to shuttles, NanoUI
2014-06-09 23:41:08 -04:00
mwerezak
730623e6e4
Adds support for different shuttle states
...
Also cleans up shuttle move states a bit.
Moves shuttle_console to it's own file
2014-06-09 23:38:53 -04:00
mwerezak
63ea6eba0d
Adds docking controllers to shuttles
...
Shuttles dock at round start.
2014-06-09 23:37:37 -04:00
Chinsky
0d2b9b8c33
Merge pull request #5170 from Jarcolr/dev
...
Adds *6* approved custom items to code
2014-06-09 00:43:09 +04:00
Mloc
0de43dc041
Merge pull request #5166 from GinjaNinja32/xenoarch-generator
...
Xenoarch generator rotation fix
2014-06-08 21:28:52 +01:00
Jarcolr
3619dede1a
Generalized kit
...
Hopefully this is going to be the last commit.
2014-06-08 20:00:31 +03:00
Jarcolr
6adc65dfcf
Fixes
2014-06-08 19:02:42 +03:00
Jarcolr
865cbb7e25
Adds matthew951's hook mod kit
...
/obj/item/device/kit/fluff/hook
http://baystation12.net/forums/viewtopic.php?f=33&t=10218
2014-06-08 11:37:28 +03:00
Jarcolr
32a015d83c
Makes the kit very very simple
...
As simple as it can get, I think.
2014-06-08 11:12:29 +03:00
Jarcolr
553d1f5f00
Adds Raptor1628's custom item
...
http://baystation12.net/forums/viewtopic.php?f=33&t=10609
/obj/item/clothing/under/rank/security/fluff/ronan_harper
2014-06-08 02:08:27 +03:00
Jarcolr
d5da0641eb
Makes the kit compatible with recent changes
...
Might be too fancy, but it's going to be useful for other kits.
2014-06-08 01:57:54 +03:00
Jarcolr
0a00370799
Added solaruin's salvage crew hardsuit
...
http://baystation12.net/forums/viewtopic.php?f=33&t=10564
/obj/item/device/modkit/salvage
2014-06-08 00:38:29 +03:00
Zuhayr
c3c6f72147
More changes. Added uses for tritium, m.hydrogen and platinum. Increased cargo price for phoron.
2014-06-08 01:39:49 +09:30
Zuhayr
78918e4795
Entirely removed the Honker mech, other refs to bananium, adamantine and mythril.
2014-06-08 00:52:20 +09:30
Zuhayr
c2f2a7cde6
Refactored material definitions a little bit, removed all bananium from the codebase.
2014-06-08 00:40:34 +09:30
Zuhayr
a026575ef7
Ironed out some bugs. Everything should be working for testing purposes.
2014-06-08 00:04:58 +09:30
Zuhayr
95a6f9d613
First pass on ore distribution map and stationary drilling rig.
...
Added sprites for stationary drilling gear.
Added skeleton ores for coal, adamantine, mythril. Updated some icons. Expanded mining rig functionality.
Changed adamantine and mythril to osmium and metallic hydrogen.
Added ore distribution map generation to master controller.
Added upgrading to stationary drills, tweaked other stuff.
Rewriting the ore processor and how ores handle information. Also rewrote the ore stacker.
2014-06-07 23:07:49 +09:30
Zuhayr
102174a40a
Added playing cards.
2014-06-07 23:00:11 +09:30
Jarcolr
5966d90f33
Adds mewth's blood red pendant
...
/obj/item/clothing/tie/fluff/radi
http://baystation12.net/forums/viewtopic.php?f=33&t=10333
2014-06-07 11:26:59 +03:00
Jarcolr
2d51c24364
Adds 2 approved custom items to code
...
http://baystation12.net/forums/viewtopic.php?f=33&t=10561
http://baystation12.net/forums/viewtopic.php?f=33&t=10517
/obj/item/weapon/lighter/zippo/fluff/janis_godmanis
/obj/item/clothing/ears/fluff/qokkri
2014-06-07 10:46:11 +03:00
GinjaNinja32
8228ef8d8e
Fix xenoarcheology field generator
2014-06-06 16:00:24 +01:00
mwerezak
9c6cd39b9c
Fixes compile error
2014-06-05 23:05:35 -04:00
Hubblenaut
a80f2b12e6
Movement with wheelchair not possible in space
2014-06-05 22:51:37 -04:00
Hubblenaut
1e09995f63
Wheelchairs spawn on footless characters
2014-06-05 22:50:42 -04:00
Hubblenaut
3c1d0a83bf
Fixes. Wheelchair is supposed to help the occupant and not the driver, damn it.
2014-06-05 22:50:24 -04:00
Hubblenaut
1e450d301d
Adds Wheelchairs with basic driving functionality
2014-06-05 22:49:20 -04:00
Zuhayr
dfa6d8ef15
Merge branch 'shuttlecontroller' of https://github.com/Zuhayr/Baystation12 into dev
2014-06-04 19:14:00 +09:30
Chinsky
da2ae4d507
Merge pull request #5143 from MrLeebo/mutiny
...
Mutiny Mode Fixes
2014-06-04 13:13:57 +04:00
Chinsky
5277840766
Merge pull request #5137 from faerindel/smes_maketerminal
...
SMES buildable terminal fix.
2014-06-04 13:13:24 +04:00
Jeremy Liberman
2a6e6bb021
Merge branch 'dev' into mutiny
2014-06-03 21:27:42 -05:00
Jeremy Liberman
dc67453796
Prevents mindless candidates for mutiny mode, adds loyalists/mutineers to AntagHUD, allows admins to reassign heads, and adds remaining Directive X objectives to Check Antagonists panel.
2014-06-03 21:26:34 -05:00
Ccomp5950
ad4c35fd29
Merge pull request #5133 from mwerezak/custom-item-yankeesamurai
...
Adds custom item for yankeesamurai - Hal Ishimaru
2014-06-03 19:50:35 -05:00
igalan
d16f3bb743
-Fixed: Trying to build a terminal without enough cables would leave SMES bugged out until VV'ed.
...
-Made maximum input and output values depend on a variable instead of a define directly. For VV or future customizable SMESes.
-Made reattempting to charge a bit smoother.
-ion_act()'s explosion is now logged.
And that's it. It's just a 30something lines commit, geez.
2014-06-03 17:35:14 +01:00
Zuhayr
99ffd06285
Moved the supply shuttle arrival/departure over to the shuttle datum. Needs testing, probably going to break.
2014-06-04 00:58:03 +09:30
Zuhayr
7a56a174dc
Converted Syndicate shuttle over to multi-shuttle setup.
2014-06-04 00:08:10 +09:30
Zuhayr
54b08ff55a
Moved the Vox skipjack console over to a multi-destination shuttle datum setup.
2014-06-03 23:21:10 +09:30
Ccomp5950
ca7b78b3a2
Merge pull request #5124 from Zuhayr/dev
...
Replaces the Derelict with a construction site.
2014-06-03 05:26:11 -05:00
Zuhayr
ca48504bf5
Update shuttle.dm
...
Corrected a mistake.
2014-06-03 18:08:35 +09:30
Zuhayr
c01b124ac7
Added a 'controller' for shuttles (really just a data container), fixed up the admin shuttle verbs into one general verb, changed shuttles to use controller instead of populating lists at spawn.
2014-06-03 18:06:05 +09:30
Zuhayr
405055eda8
Some cleanup stuff for prior commits.
2014-06-03 15:40:40 +09:30
Zuhayr
00c81bb675
Moved engineering, research and mining shuttles to a generalized system with its own directory structure.
2014-06-03 15:26:34 +09:30
Zuhayr
a2865625a5
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-06-03 14:27:46 +09:30
Mloc
c74c0630c2
Merge pull request #5126 from faerindel/smes_maketerminal
...
Made SMES terminals able to be constructed and deconstructed.
2014-06-02 22:20:39 +01:00
igalan
2eae518ea2
Nitpickity addressed: Added span classes.
2014-06-02 21:58:06 +01:00
