DJSnapshot
eacd384d39
Merge pull request #5554 from Baystation12/master
...
Updating dev with master
2014-07-09 23:00:04 -07:00
Zuhayr
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
Mloc
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
mwerezak
910ce676b0
Fixes advanced trauma kits claiming to disinfect but not doing so
2014-07-08 18:49:51 -04:00
Hubblenaut
6f1759a7aa
Fixes me being dumb with renaming variables
2014-07-08 03:07:22 +02:00
Hubblenaut
38ac5ece7c
Health Analyzer can read all types of beneficial medicine
2014-07-08 02:09:53 +02:00
Mloc-Argent
64d2a69a32
Merge remote-tracking branch 'upstream/master' into dev
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
Conflicts:
code/modules/mob/living/carbon/human/human_damage.dm
2014-07-06 17:50:53 +01:00
Zuhayr
34d19d16f5
Fffffff fixes crates not budging properly.
2014-07-05 04:17:12 +09:30
Zuhayr
67da4096b3
Fixes #5461
2014-07-04 17:48:01 +09:30
Zuhayr
0c11ebe8e8
Fixes #5490
2014-07-04 17:39:45 +09:30
Chinsky
5724a77cdb
Merge pull request #5474 from Zuhayr/master
...
Fixes climbing through shutters.
2014-07-03 20:38:56 +04:00
Zuhayr
07acb270d1
Merge pull request #5476 from Hubblenaut/wheelchair
...
Wheelchair Fixes
2014-07-03 13:16:14 +09:30
Chinsky
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
Hubblenaut
97f997dd30
Fixes in wheelchair and different handling of movement
2014-07-02 22:42:18 +02:00
Hubblenaut
dfece9fe12
Stops buckled mobs from slipping (for now)
2014-07-02 22:36:49 +02:00
Hubblenaut
c0ae74b813
Fixes non-existant feet getting bloodied and adds blood to wheelchairs
2014-07-02 22:34:50 +02:00
Zuhayr
0de57ddb2b
Fucking Hell I'm an idiot.
2014-07-03 05:10:31 +09:30
mwerezak
e57419c725
Status displays now won't blank when undocking, too
2014-07-01 22:18:04 -04:00
Zuhayr
ff9682af79
Wtf how did this line even get deleted.
2014-07-02 07:28:51 +09:30
Zuhayr
9815eef21f
Oversight with table fix.
2014-07-02 07:00:40 +09:30
Zuhayr
41488bf497
Compile fix.
2014-07-02 06:35:19 +09:30
Zuhayr
aa4581e72f
Fixes #5434
2014-07-02 06:17:26 +09:30
Mloc-Argent
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
Zuhayr
ae9bd07bd8
Merge pull request #5400 from comma/robust-squash
...
Robust squash
2014-07-01 01:11:43 +09:30
mwerezak
8af5a234a0
Improves suit cooler
...
Adds a few vars items should have, e.g. throwforce, flags, etc. Also
origin_tech.
2014-06-29 19:10:00 -04:00
Chinsky
145bfe9770
Implemented suggestions from PR
2014-06-29 19:24:19 +04:00
Chinsky
a6c7093818
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into robust-squash
...
Conflicts: lots
2014-06-29 19:16:36 +04:00
Higgin
2556d3f227
Stunbatons now run on charge.
...
Adds improvised weapons.
Increases unarmed stun time, decreases push stun time.
Increases melee embedding chance.
2014-06-29 17:46:06 +04:00
Zuhayr
922e425a33
Fixed moving between tables freely.
2014-06-29 10:46:31 +09:30
Zuhayr
c7e9e1aa2a
Fixed It won't budge! from crates, added drag and drop for table climbing, added Adajcent check to table climbing.
2014-06-29 09:40:37 +09:30
Jarcolr
14818b312a
Psychiatrists couch
2014-06-27 22:38:57 +03:00
Jarcolr
dda6ef82bd
Psych bed >> Freudian couch
...
Vetinarix kept the icon_state name when the Medbay Renovation PR thing got in. Malsquando wanted this changed.
2014-06-27 10:22:05 +03:00
Chinsky
2d52f2eac7
Merge pull request #5365 from volas/master
...
Fix infinite loop
2014-06-27 01:14:36 +04:00
volas
4528f109a5
Fix infinite loop in freeform AI module
2014-06-25 23:09:21 +04:00
PsiOmega
906ef41522
The tactical closet now calls ..() in its New() proc, allows for swallowing items placed on-top among other things.
2014-06-25 18:32:48 +02:00
Zuhayr
4e673d047e
Merge branch 'spawnpoints' of https://github.com/Zuhayr/Baystation12 into dev
2014-06-24 19:22:18 +09:30
Chinsky
d96a901ea0
Merge pull request #5342 from Zuhayr/dev
...
Allows climbing onto tables and crates, also adds falling off if you are...
2014-06-24 13:05:17 +04:00
DJSnapshot
93ccad2a82
Merge pull request #5343 from Mloc/bs12-burn
...
Fire buffs, wall damage
2014-06-23 21:22:32 -07:00
Zuhayr
96bbe1d9db
Added spawnpoint datum, moved existing latejoin spawn to datum setup.
2014-06-24 13:33:48 +09:30
Zuhayr
a5c2af7a57
Shuffling around table and crate knock/climb procs.
2014-06-24 11:11:02 +09:30
Chinsky
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
Zuhayr
7fe8a89e58
Makes table/crate falling a bit more dangerous.
2014-06-24 07:17:24 +09:30
Mloc-Argent
1aca3fe7f2
atmos: make fires more destructive
...
Fires can now burn through walls, windows, and (with a high enough
temperature) rwalls.
New proc: adjacent_fire_act(). Called on turfs that a fire isn't able
to spread to. (walls, floor surrounded by windows, etc.)
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-06-23 20:58:14 +01:00
Mloc-Argent
a33cb7272b
Merge remote-tracking branch 'upstream/master' into dev
2014-06-23 20:57:47 +01:00
Zuhayr
8fe013d531
Allows climbing onto tables and crates, also adds falling off if you are dumb enough to stand on one that is flipped or opened.
2014-06-24 03:21:27 +09:30
mwerezak
6b3c130702
Removes dynamic proc call
2014-06-23 10:55:03 -04:00
Zuhayr
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
mwerezak
67d5d56a12
Gives the suit coolers a proper process() proc
2014-06-23 02:31:36 -04:00
mwerezak
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
Chinsky
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
