Commit Graph

1136 Commits

Author SHA1 Message Date
Tastyfish
abefe71bba fixed derpy bug in spawning right dismembered foot 2012-01-12 01:47:15 -05:00
SkyMarshal
dc87ddc766 Missed a flag 2012-01-11 12:42:29 -07:00
SkyMarshal
3d9658178a Removed space capability from captain's armor.
Added memo on his desk informing him.
2012-01-11 12:34:45 -07:00
SkyMarshal
3c5cc5f3b3 Fixed some broken sprites and odd behavior of the Reactive Teleport Armor 2012-01-11 12:29:59 -07:00
Tastyfish
f922994c71 Merge remote-tracking branch 'upstream/master'
Conflicts:
	code/modules/recycling/sortingmachinery.dm
2012-01-11 00:26:42 -05:00
Tastyfish
12a9c075c8 added overlays for labelled and tagged packages 2012-01-11 00:24:02 -05: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
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
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
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
12675d12d2 fixed bad html on pain text 2012-01-09 06:54:19 -05: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
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
Tastyfish
409da96055 can operate on heads to get the head out now, also skin color 2012-01-09 01:06:16 -05: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
SkyMarshal
6e0d8de599 Fixed bug involving toolboxes and the Destructive Analyzer 2012-01-08 11:37:57 -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
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
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
Tastyfish
c4f5429857 furthur work on bones 2012-01-06 16:41:47 -05:00
SkyMarshal
240153a8a5 Genetics is no longer a fortress, fixed some disposals silliness. 2012-01-06 13:17:17 -07:00
SkyMarshal
68070d9061 Bugfixes for cloning and the mail sorting machinery. 2012-01-06 11:38:56 -07:00
Albert Iordache
8279f080dd Merge pull request #232 from Miniature/master
made blindness overlay transparent to mouse
2012-01-06 09:48:36 -08:00
Miniature
090a5c75d1 made blindness overlay transparent to mouse 2012-01-07 02:53:50 +10:30
SkyMarshal
7872eeafc1 Cloning now works right from any and all consoles.
Make the mail management less buggy and more robust.
2012-01-05 21:50:20 -07:00
cib
a7a42410ec Added an emergency response team mechanism that will be triggered on code red after a while. Dubbed the station the NSS Exodus. 2012-01-06 04:13:10 -08:00
CIB
f3ebb75637 Merge pull request #221 from Miniature/master
Now you don't need to call a proc when you use proccall(bs12)
2012-01-05 14:59:13 -08:00
Tastyfish
abd22255f3 Merge remote-tracking branch 'upstream/master' 2012-01-05 17:15:33 -05:00
Tastyfish
a7b85707dd porting in bones and dismemberment 2012-01-05 17:15:29 -05:00
SkyMarshal
5bd517bf72 Numerous fixes. 2012-01-05 14:33:29 -07:00
cib
bf62258c0a Fixes to AI malfunction and electrical storms.
- AI malfunction will now be announced, even before it starts the takeover. After 5 minutes by default, after 25 minutes if it buys the interhack module.
- Reduced blackout uses to 1.
2012-01-05 21:05:36 -08:00
cib
9e035424da Nerfed the medbot and bruise packs. 2012-01-05 19:36:26 -08:00
SkyMarshal
89df766f75 Finial stuff for the mail sorting shit. 2012-01-05 10:22:17 -07:00
Miniature
26d679c469 Merge branch 'master' of github.com:Miniature/Baystation12 2012-01-06 03:24:01 +10:30
Miniature
ac29d2c6dd Now you don't need to call a proc when you use proccall(bs12) 2012-01-06 03:23:22 +10:30