paprka
7a28f5eea0
overeye
2014-06-14 21:04:05 -07:00
Chinsky
1a3cd3786d
Merge pull request #5239 from Nerezza/dronelights
...
Built-in drone lighting
2014-06-14 19:10:14 +04:00
Zuhayr
80db3a284b
Merge pull request #5216 from Loganbacca/trainmerge
...
Cargo Trains
2014-06-14 17:13:55 +09:30
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
Ravensdale
1fe53510ed
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into freeze-master-merge
2014-06-12 05:04:28 -07:00
Zuhayr
136ccc347b
Merge with dev.
2014-06-12 01:14:40 +09:30
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
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
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
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
4233f2eb8c
Update drone.dm
...
Typo fix and message trim fix.
2014-06-06 10:13:40 +09:30
Hubblenaut
d5aacc8e79
Fixes setting internals on belt- and suit storage slots being ignored
2014-06-05 00:41:54 +02:00
Zuhayr
a00d4295a4
Fixed small drone talk and Bump() issues.
2014-06-04 16:26:12 +09:30
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
Loganbacca
7d7d095e5c
New vehicle framework
...
- Implements a new vehicle framework
- Adds cargo trains
2014-06-03 22:18:49 +12:00
mwerezak
a6bc516313
Readds flashes to all robots except drones.
...
Drones also get a special low-power flashlight, now.
2014-06-02 23:05:37 -04:00
mwerezak
29fac4e05c
Adds drone cameras to engineering network
2014-06-02 20:13:23 -04:00
mwerezak
6b11904e28
Fixes all robot_modules having access to flashes
2014-06-02 20:09:09 -04:00
mwerezak
5a1782f2f1
ID swiping drones now uses visible_message()
2014-06-02 19:52:18 -04:00
mwerezak
475bd59284
Fixes #5118
...
Also fixes robot/access() so that it will accept any one of the accesses
in req_access, instead of all - a much more likely use case.
2014-06-02 19:38:33 -04:00
Chinsky
6599545499
Merge pull request #5119 from boopcat/happydrones
...
refactors some disposals filtering code and remaps some disposals pipes
2014-06-02 18:19:28 +04:00
Zuhayr
ff20919ab5
Fixes a minor icon-flicker thing with the drone fabricator.
2014-06-02 15:41:38 +09:30
Zuhayr
1e135f91af
Merge resolution with master.
2014-06-02 12:05:12 +09:30
Boop
168c39dd54
refactors some disposals filtering code and remaps some disposals pipes
...
New things!
/obj/structure/disposalpipe/tagger
- retags a holder when it passes through
/obj/structure/disposalpipe/tagger/partial - retags a holder when it passes through two times; good for loop detection
/obj/structure/disposalpipe/sortjunction/wildcard - filters out all holders that are tagged
/obj/structure/disposalpipe/sortjunction/untagged - filters out untagged holders
Tagging doesn't use an icky list index system any more, tags are put into a global list and directly checked against.
Changed the map around a bit, disposals is now a proper loop but anything that's not tagged, is tagged with "Disposals" or anything that passes the tagger twice will be filtered out.
Not a feature, just a fix for drones being sad about weird disposals. <3
2014-06-01 23:30:20 +01:00
Zuhayr
5563fa9471
Typo.
2014-06-02 00:02:08 +09:30
Zuhayr
81af443155
Drones fixes.
2014-06-01 20:51:58 +09:30
Zuhayr
6eab07743a
Merge pull request #5108 from Zuhayr/master
...
Drone door fix.
2014-06-01 02:41:22 +09:30
Zuhayr
a8ecbeb518
Drone door fix.
2014-06-01 02:38:02 +09:30
Zuhayr
9c5fe5d9f3
Merge pull request #5106 from Zuhayr/master
...
Drone fixes.
2014-06-01 02:08:30 +09:30
Zuhayr
a3be005113
Adds a drone spawn blurb.
2014-06-01 02:05:25 +09:30
Zuhayr
273f729eee
Several drone fixes (walking over, pushing, pulling, AI sync)
2014-05-31 22:28:05 +09:30
Ccomp5950
b6b4d0826f
Ghost dsay verbs.
...
Now a bit more accurate.
2014-05-31 02:33:51 -05:00
Chinsky
189c160c07
Merge pull request #5092 from Ravensdale/dev-freeze
...
Fixes accidental renames during Phoron project
2014-05-31 05:22:07 +04:00
Mloc-Argent
3d2cc3cd82
Revert "Merge pull request #4985 from jack-fractal/dev"
...
This reverts commit 1679b4062fb149b273d9colmohici@gmail.com >
Conflicts:
code/datums/visibility_networks/update_triggers.dm
2014-05-31 00:25:56 +01:00
Mloc-Argent
ee2e68960a
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
Conflicts:
code/game/machinery/cloning.dm
code/modules/admin/admin_verbs.dm
2014-05-31 00:17:56 +01:00
Ravensdale
aa5cd46bf3
Fix to breathing in bad air.
2014-05-30 03:46:59 -07:00
Ravensdale
167fae9cf4
Fixed accidental rename during Phoron project
2014-05-30 03:05:50 -07:00
Chinsky
3ea17cefaf
Merge pull request #5083 from mwerezak/co2
...
New System for CO2 Asphixyation
2014-05-30 12:44:26 +04:00
Mike
06eb4c6edf
C02 -> carbon_dioxide
...
Renamed carbon dioxide breathing type string to hopefully prevent
confusion in the future.
2014-05-29 20:17:51 -04:00
Zuhayr
045168ba17
Merge pull request #5082 from mwerezak/inaprovaline
...
Inaprovaline no longer a substitute for breathing
2014-05-29 11:19:18 +09:30
mwerezak
9747276eb1
Fixes missing 'else'
2014-05-28 11:47:20 -04:00
mwerezak
47a7617edd
Inaprovaline no longer a substitute for breathing
2014-05-28 11:27:21 -04:00
mwerezak
d677a91c3c
Adjusts co2 warning frequencies
2014-05-28 10:59:02 -04:00
