Zuhayr
05a1bededb
Fixes #5236
2014-06-14 18:39:33 +09:30
Zuhayr
15d063c130
Fixes #4959
2014-06-14 18:33:06 +09:30
Zuhayr
98bddb9612
Fixes #5245
2014-06-14 18:06:47 +09:30
Zuhayr
cd5818fd29
Fixes #5243
2014-06-14 18:06:31 +09:30
Zuhayr
cf1fe85e62
Fixes #5246
2014-06-14 18:04:19 +09:30
Zuhayr
80db3a284b
Merge pull request #5216 from Loganbacca/trainmerge
...
Cargo Trains
2014-06-14 17:13:55 +09:30
Ccomp5950
5c115525cf
Bugfix: Humans will no longer send the same message twice when talking on binary.
...
Also: Removed the beep boop boop from showing up if you are the src of the communication.
2014-06-13 20:47:02 -05:00
Nerezza
52a76c0b0b
Make drone light into verb
...
Removes the penlight and builds a low power LED into the chassis.
Already tested to work locally, won't ghost a light.
2014-06-13 14:39:49 -05:00
Mloc-Argent
9896e44d8a
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/__HELPERS/unsorted.dm
2014-06-12 18:56:26 +01:00
Chinsky
6d432d8e9d
Merge pull request #5219 from Zuhayr/autolathe
...
Autolathe rewrite.
2014-06-12 20:28:44 +04:00
Ravensdale
1fe53510ed
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into freeze-master-merge
2014-06-12 05:04:28 -07:00
Zuhayr
0722775bda
Merge pull request #5207 from mwerezak/get_turf_loc-cleanup
...
Cleans up get_turf_loc()
2014-06-12 18:13:01 +09:30
Chinsky
c56ab301d1
Compile fix for a fix for legcuffs.
2014-06-12 02:50:11 +04:00
Zuhayr
4244479e43
Reapplying some changes.
2014-06-12 01:23:32 +09:30
Zuhayr
136ccc347b
Merge with dev.
2014-06-12 01:14:40 +09:30
Chinsky
1f7a9355f8
Merge pull request #5212 from faerindel/hydro_refactor
...
Hydroponics refactor, part 1: Files.
2014-06-11 13:30:51 +04:00
Chinsky
238d5dfc2a
Merge pull request #5211 from Ccomp5950/mentor_change
...
Mentor permissions fixes and such.
2014-06-11 13:16:18 +04:00
Chinsky
95781d751a
Merge pull request #5206 from mwerezak/shoe-cuffs
...
Fixes #5190
2014-06-11 13:10:43 +04:00
Zuhayr
4ee8f56c29
Merged master to dev, manually fixed merge issues in map, may be some left.
2014-06-11 18:11:41 +09:30
Ccomp5950
0e0c692634
Removed debugverb
2014-06-11 00:51:20 -05:00
igalan
eee72ce802
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydro_refactor
2014-06-11 03:45:00 +01:00
igalan
7d08d4701c
Hydroponics refactor, part 1: Files.
...
No code actually modified, just moved from all over the place to a module folder.
defines/obj/hydro.dm split:
-Seeds into seeds.dm
-Tools like the analyzer, pest and weedkillers into hydro_tools.dm. Hatches and scythe from defines/obj/weapon.dm moved there too.
-Non-edible plants like nettles into grown_inedible.dm. Special procs in items/weapons/hydroponics.dm moved there.
-Biogenerator and hydroponics tray files moved.
2014-06-11 03:44:29 +01:00
Ccomp5950
3aa766c689
Merge branch 'master' of github.com:Baystation12/Baystation12 into mentor_change
2014-06-10 19:49:42 -05:00
Ccomp5950
77c733b17c
Mentor permissions fixes and such.
...
Created a helper proc /proc/is_mentor(client) use this when determining if someone is a mentor and they aren't the usr of the proc (rights_check uses usr)
Mentors will no longer hear ghosts while playing
Mentors will no longer see orange text around names in check_player_age panel if they have special_roles
Mentors will no longer be able to tell players with special roles through the use of player_panel
Mentors will no longer be able to aghost, use antagHUD, then return to their bodies.
2014-06-10 19:48:41 -05:00
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
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
