mwerezak
a8c315ad52
Updates rig emp_act
...
EMPing hardsuits drains a bit of charge. Module damage is dealt to
damaged modules first. Various other adjustments.
2015-02-28 03:17:47 -05:00
Zuhayr
38d959e9f8
Should fix light level reporting.
2015-02-28 17:34:31 +10:30
Zuhayr
0beb6259f6
Partial fix for #8068 .
2015-02-28 17:29:26 +10:30
Zuhayr
273a9e2480
Should stop plants spreading through diagonal windows.
2015-02-28 17:20:49 +10:30
Zuhayr
b572763f77
Fixes #8253
2015-02-28 17:19:21 +10:30
Zuhayr
a0452f3423
Alternative fix for golem damage.
2015-02-28 17:08:30 +10:30
Zuhayr
14321003f1
Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev-freeze
2015-02-28 17:04:22 +10:30
Zuhayr
7c2678c9ed
Merge pull request #8317 from Baystation12/master
...
Master into dev-freeze
2015-02-28 17:01:42 +10:30
Zuhayr
227fda7b4c
Fixes #8245
2015-02-28 16:59:37 +10:30
Zuhayr
71ecceec9e
Fixes #8226
2015-02-28 16:51:37 +10:30
Zuhayr
4b15f1a249
Fixes #7877
2015-02-28 16:47:41 +10:30
Zuhayr
c659ebefde
Fixes #8176
2015-02-28 16:47:27 +10:30
Zuhayr
53e59cbf94
Fixes #8126
2015-02-28 16:47:08 +10:30
Zuhayr
3bf7d1446c
Fixes #8285
2015-02-28 16:45:18 +10:30
Zuhayr
d0451eaa2d
Fixes #8249
2015-02-28 16:30:34 +10:30
Zuhayr
0f6a3adf68
Fixes #8256
2015-02-28 16:28:54 +10:30
Zuhayr
bead2896bb
Merge pull request #8296 from comma/master
...
Fixes #8270
2015-02-28 16:28:05 +10:30
Zuhayr
172cecaa80
Merge pull request #8305 from DJSnapshot/dev-freeze
...
gets rid of MC tab. Returns it back to status tab.
2015-02-28 16:27:20 +10:30
Zuhayr
f7983e7732
Merge pull request #8293 from comma/interfacefix
...
Couple fixes
2015-02-28 16:22:36 +10:30
Zuhayr
5ec131fa32
Merge pull request #8312 from hockeygoalie5/fixes
...
Fixes #8255 , #8231 , #8265
2015-02-28 12:14:15 +10:30
Mustafa Kalash
5d2f492386
Fixes #8265 . Moves the print report link being added to the window to after the data is saved for printing.
2015-02-27 18:09:09 -05:00
Mustafa Kalash
14f76324b9
Fixes #8231 . Adds on_hear_radio proc for observers to add tracking.
2015-02-27 17:18:47 -05:00
Chinsky
3d95981394
Fixes #8270
...
Fixes part where alcohol potency was doubled and halves drinking glass volume so it won't hold a half of a bottle.
Also set bottle/shaker volumes to new 30u base most reagent containers like beakers/bottles use nowdays as requested.
2015-02-27 13:40:37 +03:00
Chinsky
7f01af6b7d
Merge pull request #8297 from PsiOmegaDelta/CameraCoverage
...
Camera coverage fixes.
2015-02-27 13:11:21 +03:00
Chinsky
5502779652
That should be it for procs there.
2015-02-27 13:09:40 +03:00
PsiOmega
7e498e1cf7
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/hydroponics/seed_datums.dm
code/modules/hydroponics/trays/tray_apiary.dm
code/modules/power/apc.dm
code/setup.dm
2015-02-27 09:06:48 +01:00
DJSnapshot
12024f07aa
gets rid of MC tab. Returns it back to status tab.
2015-02-26 15:32:10 -08:00
Mustafa Kalash
d258a476f8
Adds paramedic to the medical category. Fixes #8255
2015-02-26 16:37:27 -05:00
GinjaNinja32
8483d7c679
Changes grid logic to be slightly less convoluted, clamp position to inside the object's icon
2015-02-26 18:46:10 +00:00
Chinsky
9e07708cb3
Fixes #8241 rollerbeds not collapsing due to a runtime
2015-02-26 14:41:31 +03:00
Chinsky
4db51c68ef
Missed a spot in airflow fixes.
2015-02-26 13:55:27 +03:00
PsiOmega
98f6a4cae5
Camera coverage fixes.
...
Fixes issues with AI cameras coverage not updating properly in several instances during EMPs, destruction, etc.,
2015-02-26 11:39:41 +01:00
Chinsky
100d8e9fb8
Fixed buckling into chair not changing mob's facing if he had permafacing set.
2015-02-26 12:09:23 +03:00
Chinsky
d83eabdb38
Merge branch 'airflow' into interfacefix
2015-02-26 12:06:24 +03:00
Chinsky
3ba56d7f76
Alt-arrow in same direction you are set to face now resets facing direction.
2015-02-26 11:56:43 +03:00
Chinsky
728d90d06f
Now airflow knockout uses proper Weaken proc to doublecheck for flags. Should fix #8254
...
Also cleans up it a bit and adds span classes.
2015-02-26 11:17:54 +03:00
Zuhayr
f14922f1f8
Merge pull request #8288 from mwerezak/topicfix
...
Topic Fixes
2015-02-26 16:28:56 +10:30
Zuhayr
a9d23df3ff
Merge pull request #8279 from PsiOmegaDelta/CameraNet
...
Fixes camera network changes not always being reflected in camera consoles.
2015-02-26 16:28:49 +10:30
Zuhayr
bceb01c233
Merge pull request #8290 from mwerezak/gun-rewrite
...
Fixes captain's laser gun
2015-02-26 16:28:43 +10:30
Zuhayr
234273605e
Merge pull request #8271 from PsiOmegaDelta/AlertMe
...
Fixes #8266 .
2015-02-26 16:28:26 +10:30
Zuhayr
d98eb1c823
Merge pull request #8289 from MrSnapwalk/actionfigurefix
...
Fixes action figures not randomizing properly.
2015-02-26 16:26:37 +10:30
mwerezak
d06b2a0a12
EMP briefly blocks switching/engaging modules
2015-02-26 00:05:04 -05:00
mwerezak
ec59f8ab07
Fixes captain's laser gun
...
Also updates retro laser gun path, as it isn't really conceptually
related to the carbine anymore, and should avoid inheriting things like
fire rate.
2015-02-25 23:35:20 -05:00
MrSnapwalk
f4f54dfed1
Fixes action figures not randomizing properly.
2015-02-25 21:52:36 -06:00
mwerezak
6d15809768
Corrects return values for the Topic procs of several computers and some other machines as well.
2015-02-25 21:32:35 -05:00
PsiOmega
4dca85b17c
Fixes camera network changes not always being reflected in camera consoles.
...
Cameras with altered networks would not necessarily show up on camera consoles, primarily affecting cameras joining/leaving alarm zones.
2015-02-25 19:50:07 +01:00
PsiOmega
dfd83f787a
Fixes #8258 .
...
Main correction is the removal of Topic() in code/game/machinery/computer/computer.dm.
Issue introduced in #7617 where I stated multiple times this Topic()-return value was incorrect.
Ensures that computers return the correct value after the ..() check.
2015-02-25 09:47:50 +01:00
PsiOmega
768faa4bf0
Fixes #8266 .
...
Ensures drones get access to the alarm monitor subsystem.
Restores the Show Alerts link in alarm notices.
2015-02-25 09:07:04 +01:00
PsiOmegaDelta
51b722485a
Merge pull request #8259 from mwerezak/gun-rewrite
...
Gun fixes
2015-02-25 07:21:29 +01:00
mwerezak
b067b491a4
Returns the laser carbine capacity to 10
2015-02-25 00:15:08 -05:00
