SkyMarshal
25e1633487
Merge pull request #259 from Tastyfish/master
...
Took long enough to fix this damn bug.
2012-01-10 20:39:05 -08:00
Tastyfish
f404ea91d6
Merge pull request #260 from SkyMarshal/master
...
Disposal updates + map fix, traitor objective fix, Cult teleport talisman now teleports grabs
2012-01-10 20:38:14 -08:00
SkyMarshal
3494003d68
Merge branch 'master' of git://github.com/Baystation12/Baystation12
2012-01-10 21:36:35 -07:00
SkyMarshal
3b57d309cc
Disposals are now much more robust, with sorters being program-able, food able to be packaged, people able to flush closets, proper construction of sorters, and a function on taggers to use a custom tag.
...
In addition:
Made teleport talismans more amusing.
Fixed duplicate traitor objectives.
2012-01-10 21:21:52 -07:00
Tastyfish
763c9ec07b
paint is reagent, fixed ai core bug
2012-01-10 18:05:19 -05:00
SkyMarshal
f36c56f5c7
Disposal updates, fixed a messed up maintenance door.
2012-01-10 15:37:42 -07:00
cib
0340e5f58e
More medical changes.
...
- Added tramadol and oxycodone, both effective painkillers.
- Shock now takes drunkness into account.
- Added some firstaid stuff to the table in the medbay lobby, so people can do treatment when there's no doctors.
2012-01-10 09:16:11 -08:00
Miniature
d5fc419a0d
Merge pull request #256 from Miniature/master
...
fix runtimes in disposals pipes and seed making for a plant
whoever coded this should be shot
2012-01-09 16:28:31 -08:00
Miniature
225b2ad03e
fix runtimes in disposals pipes and seed making for a plant
...
whoever coded those parts should be shot
2012-01-10 10:56:58 +10:30
Albert Iordache
56ee73e22a
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-01-09 21:59:50 +02:00
Albert Iordache
5e5d72d36d
Reverted changes that would stop the bible from healing occasionally, and from burning the hands of people picking it up, who aren't chaplains
2012-01-09 21:59:25 +02:00
SkyMarshal
25426e6f02
Merge pull request #254 from SkyMarshal/master
...
Bugfix.
2012-01-09 09:08:53 -08:00
SkyMarshal
e455f46cfd
More bugfixing
2012-01-09 10:08:11 -07:00
SkyMarshal
46fb684c0b
Bugfix for chem grenades and Disposals.
2012-01-09 09:58:33 -07:00
Tastyfish
50bca2ebff
Merge pull request #253 from Tastyfish/master
...
fixed html lines
2012-01-09 03:56:15 -08:00
Tastyfish
12675d12d2
fixed bad html on pain text
2012-01-09 06:54:19 -05:00
Tastyfish
f38406ec20
Merge pull request #252 from SkyMarshal/master
...
Fixed bible, medibots, added kitchen packager, ported TTP
2012-01-08 23:19:03 -08:00
Tastyfish
6cdae453b2
Merge pull request #249 from caelaislinn/master
...
made body bads orderable via qm
2012-01-08 23:07:32 -08:00
cib
9b8e24c9d1
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-01-09 07:45:56 -08:00
cib
80f8c70e09
Band-aids and ointment work until 0 health, rather than 50 now.
2012-01-09 07:45:00 -08:00
cib
a36aebb512
A few medical-related fixes.
...
- Fixed another problem related to the crit config
- Recovering from shock won't take forever anymore
- Reduced the max speed at which you suffocate, mainly to make crit slower. If this is found to affect normal suffocation too much, increase HUMAN_MAX_OXYLOSS again.
- Open organs now add a lot of shock, as well.
- Hitting 0 health or below will make you collapse immediately.
2012-01-09 06:30:16 -08:00
cib
82033108bb
The config's HEALTH_TRESHOLD_CRIT option was being ignored in a few places, fixed this.
2012-01-09 04:30:15 -08:00
cib
f827d9f56e
Small addition so that traumatic shock will increase when a limb is missing or broken.
2012-01-09 04:09:57 -08:00
SkyMarshal
7dec599f9b
Fixed medibot stupidity and bible shit.
2012-01-09 00:06:57 -07:00
Tastyfish
b953f61ad6
Merge remote-tracking branch 'upstream/master'
2012-01-09 01:25:02 -05:00
Tastyfish
58c3d6ebe3
cleaned up brain transfer
2012-01-09 01:24:42 -05:00
SkyMarshal
3a154153bf
Merge pull request #248 from Tastyfish/master
...
Looks good. Fixes some dismemberment and stuff.
2012-01-08 22:12:45 -08:00
SkyMarshal
7bd2773571
Added thermal transfer plate to code, added packaging materials to kitchen for delivered food.
2012-01-08 23:06:38 -07:00
Tastyfish
409da96055
can operate on heads to get the head out now, also skin color
2012-01-09 01:06:16 -05:00
CaelAislinn
179ae3c2e4
made body bags orderable via qm
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-01-09 14:30:22 +10:00
Tastyfish
1d010aca75
Merge remote-tracking branch 'upstream/master'
2012-01-08 20:06:03 -05:00
Tastyfish
ce9042ae20
bones and dismemberment
2012-01-08 20:05:54 -05:00
Albert Iordache
4a3c17738e
Fixed a bug with the player panel
2012-01-08 20:42:05 +02:00
Albert Iordache
59806cb3a7
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-01-08 20:41:04 +02:00
SkyMarshal
6e0d8de599
Fixed bug involving toolboxes and the Destructive Analyzer
2012-01-08 11:37:57 -07:00
Albert Iordache
9d2e285190
Fixed a bug with obj/item/clothing/under/chameleon/psyche , added some small details to Antiqua and redid the arrivals arm, and removed the patient ward area. (can still be recovered via TortoiseGit, by reverting to an earlier version; I'll explain in the Antiqua topic why I removed it)
2012-01-08 19:19:53 +02:00
SkyMarshal
9e94f1274a
Merge branch 'master' of git://github.com/Baystation12/Baystation12
2012-01-07 18:16:32 -07:00
cib
66330222d3
Buffed the speed at which the chemistry charger generates chemicals, and also the power consumption.
2012-01-07 20:39:35 -08:00
SkyMarshal
145b3d3b5f
Tweaked flamethrowers slightly, made the UI actually do something and fixed an icon that was not updating.
2012-01-07 11:19:04 -07:00
SkyMarshal
478551fa77
Merge pull request #240 from SkyMarshal/master
...
Bugfix
2012-01-07 09:52:51 -08:00
SkyMarshal
c6027d672f
Merge branch 'master' of github.com:SkyMarshal/Baystation12
2012-01-07 10:52:02 -07:00
SkyMarshal
40a0a5499e
Bugfix for some table stuff I forgot.
...
Fixed a small message for writing on paper.
2012-01-07 10:51:32 -07:00
Albert Iordache
970ee20614
Merge pull request #239 from SkyMarshal/master
...
Table update! Yaay!
2012-01-07 00:39:00 -08:00
cib
b8f799e6d3
Emergency teams took a bit too long to be sent.
2012-01-07 02:03:13 -08:00
SkyMarshal
1c0cff4dac
Derp
2012-01-07 01:04:15 -07:00
SkyMarshal
5fd641599e
Fixed stupid unescapable edit apperance
...
Fixed some stupid with grenades.
2012-01-07 00:49:48 -07:00
SkyMarshal
f517b95e5f
Table update! Yaay!
...
Also: Fixed a redundant proc in the specops shuttle
fixed missing wire and disposal pipe in map.
2012-01-06 23:24:51 -07:00
SkyMarshal
cdbb00d264
Fixes a problem with aliums and police tape.
2012-01-06 16:55:56 -07:00
SkyMarshal
3c128170a3
Shit to update
2012-01-06 16:50:19 -07:00
Tastyfish
ffe6ac7935
Merge remote-tracking branch 'upstream/master'
2012-01-06 16:41:52 -05:00
