6c62e9e56b
should fix #5618 , trivial kitchen utensil bug
2014-07-16 20:28:19 +02:00
d59e5b8da2
Merge pull request #5603 from DJSnapshot/hotfix
...
Changing URL of Corporate Regulations to the new Corporate Regulations
2014-07-14 07:12:37 +04:00
743ac61155
Little Slip-up
2014-07-13 13:30:36 -07:00
5063178aa6
Changed URL to Corporate Regulations
2014-07-13 13:29:19 -07:00
4e371f7af7
Merge pull request #5585 from SparklySheep/patch-3
...
Fuk da law
2014-07-13 08:56:54 +04:00
c0487b9c90
Fixes human internal organs list
2014-07-12 16:15:37 -04:00
55c7fbe739
Changes Space Law book to Corporate Regulations
...
Because fuck anyone that thinks "Space Law" is a good name for a roleplaying server.
2014-07-12 10:26:54 -05:00
e44bcf81fe
Merge pull request #5559 from Walter0o/deadly_fork_fix
...
deadly sharp w_class 1 fix
2014-07-10 23:40:25 -05:00
5289776e33
removes sharpness from forks
...
too commonly available to enjoy the sharp bonus.
2014-07-10 19:47:59 +02:00
c984385adb
Merge branch 'master' of https://github.com/baystation12/baystation12
2014-07-09 14:53:16 -06:00
f477012ab8
Merge pull request #5533 from mwerezak/wound-infections
...
Fix for #5532 and the last of the infection changes, I hope
2014-07-09 19:28:00 +09:30
c7b2aefdc7
Merge pull request #5534 from Hubblenaut/master
...
Fixes painkillers leaving the body way too fast and adds minor feature to health analyzers
2014-07-09 10:41:22 +01:00
910ce676b0
Fixes advanced trauma kits claiming to disinfect but not doing so
2014-07-08 18:49:51 -04:00
0e1d549ff1
Update PDA.dm
...
Patched the comment to match the actual, final behavior (Doh!)
2014-07-07 22:57:37 -06:00
6f1759a7aa
Fixes me being dumb with renaming variables
2014-07-08 03:07:22 +02:00
38ac5ece7c
Health Analyzer can read all types of beneficial medicine
2014-07-08 02:09:53 +02:00
da6ff0a251
Patched PDA scanner to be more useful
...
PDA's integrated scanner was VERY rudimentary. Patched it to resolve
some formatting issues and improve usability.
2014-07-05 19:55:23 -06:00
07acb270d1
Merge pull request #5476 from Hubblenaut/wheelchair
...
Wheelchair Fixes
2014-07-03 13:16:14 +09:30
67c425fe2b
Merge pull request #5463 from mwerezak/emergency-shuttle
...
Fixes shuttle ETA blanking out on launch, allows escape pods to be armed by breaking into the pod.
2014-07-03 05:10:35 +04:00
dfece9fe12
Stops buckled mobs from slipping (for now)
2014-07-02 22:36:49 +02:00
e57419c725
Status displays now won't blank when undocking, too
2014-07-01 22:18:04 -04:00
6630e4838e
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
Conflicts:
code/game/machinery/alarm.dm
2014-06-30 23:44:46 +01:00
4528f109a5
Fix infinite loop in freeform AI module
2014-06-25 23:09:21 +04:00
6393cb15d8
Merge pull request #5332 from mwerezak/wound-infections
...
Gives the suit coolers a proper process() proc
2014-06-24 05:32:47 +04:00
a33cb7272b
Merge remote-tracking branch 'upstream/master' into dev
2014-06-23 20:57:47 +01:00
6b3c130702
Removes dynamic proc call
2014-06-23 10:55:03 -04:00
a6f64ccd9c
Merge pull request #5330 from mwerezak/emergency-shuttle
...
Updates emergency shuttle controller to use shuttle datums
2014-06-23 21:19:36 +09:30
67d5d56a12
Gives the suit coolers a proper process() proc
2014-06-23 02:31:36 -04:00
1c91b2984d
Supply controller now holds a ref to it's shuttle
...
Instead of having to look it up every time.
2014-06-22 14:18:52 -04:00
7e56df8689
Merge pull request #5308 from mwerezak/wound-infections
...
Re-enables infections, implements a wound infection system, improves body temperatures
2014-06-22 22:04:25 +04:00
1cfb9b6ea1
Merge branch 'master' of https://github.com/Zuhayr/Baystation12 into dev
2014-06-22 21:58:46 +09:30
bb8951a53c
Makes forks usable.
2014-06-22 21:49:55 +09:30
37e63dfcb0
Fixes FEA temperature_expose() being used...
...
...instead of ZAS fire_act().
2014-06-22 00:13:22 -04:00
5bd975850a
Less terrible sprite for suit cooling device
...
Also adds a few of them to EVA storage.
2014-06-21 20:41:29 -04:00
9528557573
IPCs actually take heat damage from temperature now
...
Also fixes the healthanalyzer still not scanning IPCs properly (scanning
them when it shouldn't)
2014-06-21 16:58:20 -04:00
b9fa433087
Adds suit cooling device
...
Also:
Breathing in hot/cold air will affect your body temperature.
Fixes old body temperature stabilization code not working.
Thermometer icon now adjusts based on species.
Reduced BODYTEMP_AUTORECOVERY_MINIMUM to a less ridiculous value.
2014-06-21 16:53:18 -04:00
0c060d144b
IPCs now need to be scanned with a robotanalyzer
2014-06-21 11:08:09 -04:00
68d01b00ab
Merge pull request #5297 from comma/fancy
...
Nextgen lights
2014-06-20 20:30:11 -05:00
cf5ff7e992
Body temperature fixes and updates
...
Body temperature regulation is now based on species, and environmental
temperature now respects the air density when affecting living/humans.
This also fixes some bugs with heat/cold protection handling and
improves the way synthetic species body temperatures are handled to be
much more logical.
IPCs always gain temperature but cool down because of their environment.
When the heat transfer to the environment is reduced because of the lack
of air, this will cause IPCs to heat up.
As well, having an infection will increase your body temperature, and
body scanners now detect infections.
2014-06-20 18:18:02 -04:00
dd7f0dac0e
Merge remote-tracking branch 'upstream/master' into dev
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
Conflicts:
code/game/machinery/computer/card.dm
code/modules/mob/living/say.dm
2014-06-20 22:02:40 +01:00
33fa88e27a
Merge pull request #5309 from mwerezak/flashbang
...
Fixes #5186
2014-06-20 21:23:34 +09:30
25e333a39b
Fixes #5186
2014-06-20 02:48:12 -04:00
6f6cf57a93
Merge pull request #5277 from Jarcolr/dev
...
Adds paths for therapy dolls from #2731
2014-06-20 09:02:03 +04:00
e46c3c8834
Renames supply controller global var
...
Renamed from 'supply_shuttle' to 'supply_controller'
2014-06-18 19:37:46 -04:00
462593f0b5
Adds supply shuttle datum
2014-06-18 19:37:30 -04:00
2396c6d882
Nextgen lighting #2 : Lights
...
Can paint light tubes and bulbs with paint and stick in sockets to get colored lights.
2014-06-18 20:38:33 +04:00
fc73c8de22
Changes paint tile coloring to use color var, less icon procs.
2014-06-18 20:20:18 +04:00
4b7a8610b8
Fix latex gloves box not having the right sprite
2014-06-18 13:32:10 +01:00
342bee81d4
Merge pull request #5284 from boopcat/happydrones
...
more fixes!
2014-06-18 08:58:00 +09:30
a903e400dd
Fixes #5088
...
also fixes more runtimes that mloc gave me
2014-06-17 20:35:48 +01:00
Walter0o