0345024f04
Removes telecomm and RD server temperature cap
2014-07-28 20:24:17 -04:00
bf0a17dcb0
Fixes NOPOWER not updating when machines are moved
2014-07-28 18:52:13 -04:00
5eaebce87e
Merge remote-tracking branch 'upstream/dev' into power-net
2014-07-27 20:25:57 -04:00
cd1ed034a8
Adds power net profiling verbs
2014-07-27 19:59:02 -04:00
d6caf74e56
Merge pull request #5769 from comma/dev
...
Enables logging of people beating monkey
2014-07-27 12:02:26 +01:00
83d54af746
Adjusts power usage for R&D equipment
2014-07-27 03:36:28 -04:00
cb413454a3
Optimizes atmos machine power updates
...
Makes power usage but atmos machinery less accurate but reduces lag
somewhat.
2014-07-27 03:35:25 -04:00
5f9f6e2054
Merge remote-tracking branch 'upstream/dev' into power-net
2014-07-26 13:56:52 -04:00
e5eb9cc496
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into hydroponics
2014-07-27 03:24:27 +09:30
dc10f92ad1
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydroponics
2014-07-27 03:23:35 +09:30
4ef8a08310
Added portable_atmospherics to hydroponics machine path, couple of other tweaks.
2014-07-27 03:20:16 +09:30
976cb4f844
Fixed seeds not showing up properly in the vendor.
2014-07-27 03:19:43 +09:30
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
c34cf89a04
Merge pull request #5784 from Jarcolr/patch-3
...
Fixes #5691
2014-07-26 17:18:38 +04:00
9e233f1597
Fixes #5691
...
Chef >> Chefhat
2014-07-26 13:41:43 +03:00
17f86962ac
Fixes #5773
...
Added /obj/item/weapon/FixOVein to surgery cyborg modules.
2014-07-26 12:50:41 +03:00
bc25cca7a9
Merge branch 'hydroponics' of https://github.com/Zuhayr/Baystation12 into hydroponics
2014-07-26 15:45:26 +09:30
5a108b2d05
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into hydroponics
2014-07-26 15:40:28 +09:30
efe1c2feb2
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into hydroponics
2014-07-26 15:39:25 +09:30
d4ce124fe0
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into hotfix
2014-07-25 19:37:10 -07:00
9be6de1e77
fixes admin show-skills verb.
2014-07-25 19:34:13 -07:00
de282a4e2a
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/modules/client/preferences.dm
2014-07-25 17:19:59 -07:00
1e1d5a6d01
Enables logging of people beating monkey.
...
Also updates it to species code and visible message helper. Shit is anicent.
2014-07-26 04:09:20 +04:00
f33e11383b
Merge pull request #5751 from DJSnapshot/hotfix
...
Bug Fixes!
2014-07-26 03:28:54 +04:00
69b397b5c4
Compile fix.
2014-07-26 01:42:05 +09:30
b32bbf8d2c
Merge pull request #5741 from mwerezak/wound-infections
...
Attempts to prevent ninja infections, body temperature fix, icon fix
2014-07-26 01:30:12 +09:30
d8336061b4
Merge branch 'hydroponics-pr' of https://github.com/Zuhayr/Baystation12 into dev
2014-07-25 23:02:21 +09:30
5da36d265e
Merge resolution with PDA nanoui.
2014-07-25 22:57:53 +09:30
57b790ad92
Merging.
2014-07-25 22:50:35 +09:30
ea8b08c49b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydroponics
2014-07-25 22:34:40 +09:30
4d1812ba2b
Hydroponics rewrite, details will be in PR. Big commit.
2014-07-25 22:16:04 +09:30
7fb8f30cc7
New machines, adjusted Cael's seeds, rewrote space vines.
2014-07-25 22:15:33 +09:30
2c7bb6c48d
Remerged Siik'maas and siik'tajr together as per the tajara maintainer's request.
2014-07-24 17:01:52 -07:00
79d4c444c2
Merge remote-tracking branch 'upstream/dev' into power-net
...
Conflicts:
code/ATMOSPHERICS/components/binary_devices/pump.dm
code/game/machinery/alarm.dm
code/game/machinery/spaceheater.dm
2014-07-24 16:04:41 -04:00
31fe0d5e34
Cargo train fixes
...
- Visual tweak for mobs on trolleys
- Fixed a teleportation bug when boarding trains from other trains
- Fixed a runtime involving on_click code
2014-07-24 20:14:58 +12:00
1b1e4bc118
Cargo train update
...
- Adds sprites (thanks to Bishop)
- Adds order-able train cargo crates
2014-07-24 18:01:10 +12:00
bb336b7691
temporary fix for #4907
2014-07-23 21:48:32 -07:00
f8d478fcbb
Updates to gun targeting UI. Fixes #5710
2014-07-23 20:51:58 -07:00
78e4e259db
Fixes icons not being updated for necrosis
2014-07-23 22:41:52 -04:00
d9f70c2fd2
Adjusts the rate that infections deal toxin damage
2014-07-23 22:35:04 -04:00
60c6a2ea92
Fixes fever temperature not being reached
2014-07-23 22:34:04 -04:00
d0e01f70cc
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-07-23 21:58:13 +01:00
db95401506
Merge pull request #5735 from Mloc/bs12-power
...
XGM gas mixtures
2014-07-23 21:05:56 +04:00
c3f62d4f52
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-07-23 14:37:10 +01:00
61d38a3e86
Merge pull request #5740 from Ccomp5950/taser_slow_down
...
Tasers will now cause movement slow downs on the first hit
2014-07-23 17:46:55 +09:30
fe9785d630
Tasers will now cause movement slow downs on the first hit
...
Before: Tasers do 40 halloss damage and that drops to 39 on next life() tick so most people won't be slowed down by the first taser hit.
After: If you have any halloss you will slow down some. I've set it at 1 delay for every 10 halloss, this might need adjusting (15 instead of 10 possibly)
2014-07-23 02:55:37 -05:00
98abc5bfc4
Compromise on speach_sound, will check distance instead of just checking if ghost.
2014-07-23 01:48:48 -05:00
477d32ff64
Ghosts will no longer hear clientless mobs random talking unless they are in view.
...
Experiment 97B says, 'EHEHEHEHEHEHEHE!'
2014-07-22 19:33:56 -05:00
75803c5140
Positronic brains (and every other mob) using binary chat will no longer send their messages twice.
...
Fixes : #5444
2014-07-22 19:32:52 -05:00
e01e081cbb
screen_shake (meteors, etc.) made more robust and works with aiEyes
...
Before: multiple screen_shake's could queue up prior to screenshake being set on the mob setting
oldeye on the last one to queue up to be the random location from the previous screen shake
so sometimes peoples clients were stuck on a location instead of back on the mob.
Now we set screenshake before the spawn so we don't spawn up multiple screen_shakes on the same mob.
Test: Be ghost, hammer the spawn meteors secret 10 times or so, watch as your camera returns back to your mob.
Yay.
2014-07-22 19:05:04 -05:00
mwerezak