mwerezak
7130fd124b
Stun baton nerf
...
Adds agonyforce var to stun batons, which causes halloss and eye blur.
Also did some clean up of stun batons, and fixed the stun baton's bcell
var being of type weapon/cell/high instead of weapon/cell.
2014-07-31 13:39:06 -04:00
Zuhayr
202398d0e2
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-07-31 23:08:14 +09:30
Zuhayr
afc40e7f44
Fixes #5202
2014-07-31 20:46:52 +09:30
Zuhayr
a3778f5a5d
Fixes #5774
2014-07-31 20:14:25 +09:30
Walter0o
7416d26197
robot computer emagging exploit fix
...
so an emagged borg can in turn emag all others ?
the more you know.
seems extremely OP to me but i am just closing the exploit, not changing the game.
2014-07-31 10:38:34 +02:00
MrSnapwalk
84ceb30d27
Psychiatrist/Psychologist update.
2014-07-30 20:57:20 -05:00
Rob Nelson
68a13a6d60
Vending machine href exploit fix
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
Conflicts:
code/game/machinery/vending.dm
2014-07-30 21:47:29 +01:00
mwerezak
17574b8b20
Allows escape shuttle to scan IDs from within UI
...
Fixes #5592
2014-07-30 15:13:53 -04:00
Zuhayr
f2393d9465
Replaces antag intro text and objective announcement with a proc.
2014-07-30 21:36:31 +09:30
Zuhayr
e885fc8115
Added Calamity mode.
2014-07-30 21:09:25 +09:30
Zuhayr
3105297f3e
Adjusted spawn procs for heist and nuke.
2014-07-30 21:08:28 +09:30
JimTheCactus
19b032d8e8
Fixed bad reference to active 1 in the medical computer's DNA field inputs.
2014-07-30 01:09:26 -06:00
JimTheCactus
4d920bef59
Corrected variable edited field for blood dna. Was dna, not b_dna like it should be.
2014-07-29 23:19:29 -06:00
Zuhayr
251b44a53c
Changed hydro trays, fertilizer and syringes over to use the reagent procs.
2014-07-30 12:24:03 +09:30
PsiOmega
3ad8f4ca24
Merge branch 'dev' into Pics
...
Conflicts:
code/modules/paperwork/photography.dm
2014-07-29 16:45:55 +02:00
Chinsky
fcdca5ca5b
Merge pull request #5832 from Baystation12/master
...
master - > dev
2014-07-29 18:37:19 +04:00
Chinsky
8ccac61068
Merge pull request #5820 from Zuhayr/hydroponics
...
Bevy of newhydro fixes.
2014-07-29 17:59:28 +04:00
Chinsky
bf686a6401
Merge pull request #5815 from PsiOmegaDelta/Mecha
...
An Odysseus with patients now bypass mech movement-overrides.
2014-07-29 17:58:18 +04:00
PsiOmega
2f8bb7e135
Fixes runtime errors. AIs and cyborgs can now attach their photos to newscasters as well as photocopy them.
2014-07-29 15:45:22 +02:00
mwerezak
0345024f04
Removes telecomm and RD server temperature cap
2014-07-28 20:24:17 -04:00
mwerezak
e104647404
Sound fixes
2014-07-28 14:09:16 -04:00
Zuhayr
f8e50b28f5
Bevy of newhydro fixes.
2014-07-29 00:20:38 +09:30
Mloc
f7cfe55867
Merge pull request #5816 from Loganbacca/trainfix
...
More train fixes
2014-07-28 12:45:00 +01:00
Mloc
7b4382977b
Merge pull request #5813 from PsiOmegaDelta/Shuttle
...
Fixes #5810
2014-07-28 12:42:58 +01:00
Zuhayr
ad8ef7c4ab
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-07-28 20:59:29 +09:30
Loganbacca
5457cee527
More train fixes
...
- No passing plastic flaps
- Only human based mobs can board trains
- Adjacent checks for exiting vehicles
- Cleaned up as many direct loc moves as possible
- Places removed cells in the removers hand
2014-07-28 20:39:42 +12:00
PsiOmega
b935d7a0e0
An Odysseus with patients now bypass mech movement-overrides.
2014-07-28 10:25:29 +02:00
PsiOmega
537fa50728
Area naming consistency
...
Changes area name from "supply shuttle" to "Supply Shuttle" to match the casing of other areas.
2014-07-28 08:37:14 +02:00
Zuhayr
f61139f501
Merge pull request #5811 from DJSnapshot/hotfix
...
Massive bugfix/improvement to 3D sounds
2014-07-28 15:45:11 +09:30
DJSnapshot
f6b75d833c
now you can hear next to you in space!
2014-07-27 23:10:57 -07:00
DJSnapshot
3b5d40c470
Big nerf and cleanup of 3D sound. should fix most of #5789
2014-07-27 21:27:41 -07:00
Zuhayr
11a2b0eb3c
Merge pull request #5792 from Whitellama/flavourtext
...
Dynamic Flavour Text
2014-07-28 10:11:02 +09:30
mwerezak
5eaebce87e
Merge remote-tracking branch 'upstream/dev' into power-net
2014-07-27 20:25:57 -04:00
mwerezak
e8a4818d2b
Optimizes air alarm power updating
2014-07-27 19:59:26 -04:00
PsiOmega
fc5d33917b
Attempts to ensure that the captain (or the head loyalist to be precise, whomever he might be) is not a candidate for the directives.
2014-07-27 23:32:36 +02:00
PsiOmega
2c076b4e46
Merge branch 'dev' into MechInstall
2014-07-27 12:52:42 +02:00
Chinsky
4e96420e49
Merge pull request #5761 from Zuhayr/hydroponics
...
BYOND akbar
2014-07-27 14:38:18 +04:00
PsiOmega
4f8dc3f951
Installs the new mecha-sensor in the departure area airlocks and the shuttle itself.
...
Also corrects the online icon state for the sensor and allows the simple docking controller to toggle the on/off state.
2014-07-27 10:58:55 +02:00
mwerezak
83d54af746
Adjusts power usage for R&D equipment
2014-07-27 03:36:28 -04:00
Zuhayr
c6e97ecc9a
Merge pull request #5791 from PsiOmegaDelta/Roadblock
...
Mech/Train sensor
2014-07-27 10:12:55 +09:30
Whitellama
8f1417f14c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into flavourtext
2014-07-26 17:09:12 -07:00
Whitellama
bbc9150793
Updated body_parts_covered
2014-07-26 17:06:08 -07:00
PsiOmega
0036bea6b6
A sensor which registers mechs and trains attempting to pass by and, if necessary, blocks their movement.
...
If enabled, detects mechs/trains and blocks their movement if they are coming from any of the directions set by dir. Can currently only be enabled/disabled by radio command and airlocks are updated to utilize this.
The current setup allows mechs to move through airlocks during normal cycles, which for example lets Odysseus out to save lives.
Once a shuttle docks however, the sensors are enabled to prevent boarding.
If blocked, players receive a simple message stating that their command has been overridden.
2014-07-26 20:07:18 +02:00
mwerezak
5f9f6e2054
Merge remote-tracking branch 'upstream/dev' into power-net
2014-07-26 13:56:52 -04:00
Zuhayr
dc10f92ad1
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydroponics
2014-07-27 03:23:35 +09:30
Zuhayr
4ef8a08310
Added portable_atmospherics to hydroponics machine path, couple of other tweaks.
2014-07-27 03:20:16 +09:30
mwerezak
11c9f3bb9b
Updates scrubbers
2014-07-26 12:23:35 -04:00
Mloc-Hibernia
a2dc7b827b
Merge remote-tracking branch 'upstream/pr/5689' into dev
...
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
Conflicts:
code/game/machinery/computer/crew.dm
2014-07-26 14:25:24 +00:00
Chinsky
11a1370b10
Merge pull request #5781 from PsiOmegaDelta/Tweaking
...
Engine room and Atmospherics changeup.
2014-07-26 17:56:00 +04:00
Walter0o
df6ac58d84
fixes nullpointer caused by broken organ list pt 2
...
more a prevention than a fix, but meh
2014-07-26 13:08:25 +02:00
