Mloc
171a8e2111
Merge pull request #5127 from Ccomp5950/mentor_change
...
Mentor Unnerf.
2014-06-02 22:20:24 +01: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
Ccomp5950
1350115824
Mentor Unnerf.
...
JMP was doing a rights check in the Topic instead of doing it on the proc, just went ahead and fixed the rights check to include mentors.
Mentors now have player panel but can't see traitor panel. The idea is so they can't tell who is an antag through this.
2014-06-02 07:09:00 -05:00
Chinsky
2c4e9a2f38
Merge pull request #5117 from Ccomp5950/mentor_change
...
Mentor changes.
2014-06-02 10:36:18 +04:00
Zuhayr
ff20919ab5
Fixes a minor icon-flicker thing with the drone fabricator.
2014-06-02 15:41:38 +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
Ccomp5950
b0b7953af7
Mentor changes.
...
Mentors no longer see stealthmins
Mentors no longer see antagonists / have check_antagonist verbs
New debug verb: Reload Mentors (or mods)
2014-06-01 13:51:49 -05:00
Zuhayr
5563fa9471
Typo.
2014-06-02 00:02:08 +09:30
Zuhayr
a7c3c67da8
Fixes #5098
2014-06-01 21:09:30 +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
Zuhayr
5f98ccaaf8
Added smaller spraybottle for drones.
2014-05-31 22:15:28 +09:30
Ccomp5950
b6b4d0826f
Ghost dsay verbs.
...
Now a bit more accurate.
2014-05-31 02:33:51 -05: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
Ccomp5950
fd78c58f46
Bot down? Let's not lock up the entire server.
...
Instead we'll spawn a thread to handle it, not like we care what is returned either way.
2014-05-29 21:36:34 -05: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
47a7617edd
Inaprovaline no longer a substitute for breathing
2014-05-28 11:27:21 -04:00
Zuhayr
8f50fbcd3b
Fixes #4940
2014-05-28 17:00:31 +09:30
Zuhayr
c2b97b7fcb
Fixes #4643
2014-05-28 16:41:54 +09:30
mwerezak
fbaa84c509
More sensible oxyloss scaling
2014-05-27 02:41:12 -04:00
mwerezak
694f0706bb
Fixes inhale_pp ratio
...
The amount of inhaled gas used shouldn't approach infinity as inhale_pp
goes to zero, should it?
Also the amount of gas used should decrease with inhale_pp as the
oxyloss is being caused by the fact that fewer moles are entering the
bloodstream.
2014-05-27 02:39:32 -04:00
mwerezak
7c7df8b4e2
Fixes #5018
2014-05-26 17:16:58 -04:00
Zuhayr
dcbe9ce061
Merge pull request #5048 from Hubblenaut/dev-freeze
...
Paper bundle fixes and other general game improvements
2014-05-26 23:18:27 +09:30
Zuhayr
32935b4db9
Merge pull request #5055 from mwerezak/disease2-verb
...
Fixes #4889
2014-05-26 16:53:00 +09:30
Zuhayr
1313034133
Merge pull request #5044 from mwerezak/consoles
...
Console fixes
2014-05-25 22:09:47 +09:30
Ccomp5950
ff0d667337
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
2014-05-24 19:02:16 -05:00
mwerezak
d5b22e9125
Forgot to add VV menu entry for give_disease2
2014-05-24 12:14:16 -04:00
mwerezak
2c3ecc78d5
Fixes #4889
2014-05-24 11:54:55 -04:00
mwerezak
fa458a63ec
Fixes #5050
2014-05-24 11:00:46 -04:00
Hubblenaut
cd917e4125
Small bugfix for merging paper bundles
2014-05-24 02:27:38 +02:00
Hubblenaut
f602e10073
No longer toggling suit sensors when restrained.
2014-05-23 23:23:58 +02:00
Hubblenaut
4aff667d69
Spelling correction: It's called 'Accessory', not 'Accessoires'. Dang.
2014-05-23 23:23:25 +02:00
Hubblenaut
7e10d64252
Attack paper bundles with paper bundles
2014-05-23 22:50:34 +02:00
Hubblenaut
e28ce8a366
Removed all prefixes of type 'paper - '
2014-05-23 22:31:27 +02:00
Hubblenaut
041254ddc5
Fixes #5029
2014-05-23 22:23:02 +02:00
Hubblenaut
7b9518d4ce
Merge branch 'paperwork' into dev-freeze
2014-05-23 22:10:01 +02:00
Hubblenaut
52a9f0eb8e
Huge code cleanup and bugfixes, slight overlay modifications
2014-05-23 22:05:13 +02:00
Hubblenaut
5736200d18
Strip interface changes: Accessories, Pockets, Suit Sensors
2014-05-23 17:56:27 +02:00
mwerezak
296336e15e
Small fixes
2014-05-22 18:19:55 -04:00
mwerezak
637f7193fc
Fixes circuit var for other consoles
...
Also cleans up attackby while we're at it.
2014-05-22 18:05:57 -04:00
mwerezak
6308c2b7fe
Fixes wrong access on RD console
2014-05-22 17:36:46 -04:00
mwerezak
eb58fb1e0c
Fixes RD console circuit var not set.
...
Also removes redundant attackby code, and small change to text when
setting access protocol on the board.
Related to issue #5006
2014-05-22 17:36:01 -04:00
Hubblenaut
81b73357a6
Fixes typo in code
2014-05-20 00:28:54 +02:00
Hubblenaut
a5b306ea70
Copies tiny icon of photos accordingly
2014-05-20 00:02:31 +02:00
Hubblenaut
40c90a88d6
Removes name prefix of renamed photos
2014-05-19 23:41:53 +02:00
