Commit Graph

7776 Commits

Author SHA1 Message Date
Zuhayr
9339b1235b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-06-11 09:14:13 +09:30
mwerezak
a8816823a5 Replaces get_turf_loc() with get_turf()
The former does exactly the same thing as get_turf(), except it runtimes
if one of the atoms has a null loc.
2014-06-10 13:43:11 -04:00
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
sick-trigger
027514c6f3 Feed other text fix
Fixes #5199
2014-06-10 10:37:43 +10:00
unknown
58700869fe Fixes #5190 2014-06-09 12:35:00 -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
Chinsky
6c78188007 Merge pull request #5175 from Hubblenaut/master
Fixes some printouts causing a runtime error when photocopied
2014-06-08 18:40:21 +04:00
GinjaNinja32
07e1701fbb Fixes shoulder holster 2014-06-08 15:25:04 +01: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
Hubblenaut
f12ee3f7b3 Fixes some printouts causing a runtime error when photocopied 2014-06-07 18:27:22 +02: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
Chinsky
e5a468521d Merge pull request #5167 from Hubblenaut/master
Minor fixes
2014-06-07 19:25:14 +04:00
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
Hubblenaut
eb2f9f0de1 Fixes stamp overlays being partly off the paper 2014-06-07 04:43:58 +02:00
Hubblenaut
a522cf9399 Fixes runtime error when copying the stamped EFTPOS paper 2014-06-06 20:45:39 +02:00
Zuhayr
d713b6517d Merge pull request #5152 from sick-trigger/master
Small fixes/changes
2014-06-07 03:03:14 +09:30
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
SparklySheep
8c6ee1061e Removes Impedrezene from the Paralysis Pen
Because random brain damage from a pen is terrible, especially if you're trying to extract information from the person.
2014-06-05 21:53:16 -05: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
4233f2eb8c Update drone.dm
Typo fix and message trim fix.
2014-06-06 10:13:40 +09:30
sick-trigger
aecf06028e Painkillers leave body correctly
Tramadol, paracetamol and oxy will now leave a mob's body. Fixes #5150.
2014-06-05 18:09:18 +10:00
Hubblenaut
d5aacc8e79 Fixes setting internals on belt- and suit storage slots being ignored 2014-06-05 00:41:54 +02:00
Hubblenaut
106d0a4811 Fixed an issue with IBs being almost twice as bad 2014-06-05 00:02:44 +02:00
Zuhayr
65a2f590b7 Merge pull request #5136 from Zuhayr/master
Serithi's request, taj and unathi spawn with sandals.
2014-06-04 19:52:00 +09:30
Zuhayr
dfa6d8ef15 Merge branch 'shuttlecontroller' of https://github.com/Zuhayr/Baystation12 into dev 2014-06-04 19:14:00 +09:30
Chinsky
13633b06db Merge pull request #5142 from mwerezak/vox-breathmask
Fixes #5138
2014-06-04 13:14:18 +04:00
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