Tastyfish
a591aef35c
water pipes base + pda support
2012-01-24 15:45:51 -05:00
Albert Iordache
df354af1f3
Merge pull request #294 from Tastyfish/master
...
added L & R to zone_sel hud thing, check antag call shuttle, marked datum call proc
2012-01-19 11:01:04 -08:00
Tastyfish
51780a5c05
Merge pull request #291 from SkyMarshal/master
...
Radio and map update.
2012-01-18 23:16:15 -08:00
SkyMarshal
18bd946668
Finally fixed the access stuff for medbay. It was a bug introduced by Doohl.
...
Also made electric chairs amazing, but the sprite needs work.
2012-01-19 00:12:24 -07:00
Tastyfish
06fce40d34
herped the mark datum thing
2012-01-19 01:54:48 -05:00
Tastyfish
1be9c4cfed
check antag "call shuttle" overrides fake recall, can use marked datum as arg in the bs12 call proc command
2012-01-19 01:19:58 -05:00
Hawk-v3
7358dfa1a8
Merge pull request #289 from Tastyfish/master
...
allow non-MMI brains to ghost (since they can't do anything), admin-spawnable bone repairing syrum
2012-01-17 18:03:09 -08:00
Tastyfish
cc449f48c6
Merge remote-tracking branch 'upstream/master'
2012-01-17 20:36:03 -05:00
Tastyfish
d1fc384533
allow non-MMI brains to ghost (since they can't do anything), admin-spawnable bone repairing syrum
2012-01-17 20:34:12 -05:00
SkyMarshal
f509cda7b0
Merge pull request #284 from Tastyfish/master
...
added orderable chickens and cows
2012-01-16 23:17:36 -08:00
SkyMarshal
0d7ce5f347
Port of the TG radio system. Tasty and I tested it out and it works smooth and clean :)
...
We were able to restore functionality after we blew up half the radio equipment, as well.
AI satellite is now the Comms satellite.
2012-01-17 00:12:30 -07:00
Tastyfish
53baf4755f
Merge remote-tracking branch 'upstream/master'
2012-01-16 20:27:36 -05:00
Tastyfish
df208f7189
added orderable chickens and cows
2012-01-16 20:26:17 -05:00
Albert Iordache
725ec31a57
Merge pull request #278 from caelaislinn/master
...
Fixed disposals error from using a grab on a disposal chute.
2012-01-13 11:52:53 -08:00
CaelAislinn
07fb3f1eb8
fixed error from using a grab on a disposal chute
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-01-13 21:51:16 +10:00
Albert Iordache
e3c4b0f88f
Merge pull request #276 from SkyMarshal/master
...
Weldpack added, not on map; Clipboards fit on belt; Wrapping is more robust.
2012-01-12 11:43:39 -08:00
SkyMarshal
70cb3417ef
Added weldpack, clipboards fit on belt, food and other things can now be wrapped
2012-01-12 11:13:05 -07:00
CaelAislinn
47451d9f53
conveyors in the mini outposts on the mining asteroid should now work properly
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-01-12 16:59:36 +10:00
Tastyfish
b5c8b89a4d
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
code/WorkInProgress/Mini/customitems.dm
2012-01-12 01:48:33 -05:00
Tastyfish
abefe71bba
fixed derpy bug in spawning right dismembered foot
2012-01-12 01:47:15 -05:00
SkyMarshal
80761ed2e5
Added pink labcoat.
2012-01-11 22:21:26 -07:00
SkyMarshal
98b6019f99
Implanters now work properly. This is a bugfix.
2012-01-11 21:28:34 -07:00
Albert Iordache
25f7741772
Fixed a UI bug caused by the lack of var/over = 1 for PDAs
2012-01-12 16:58:46 +02:00
Albert Iordache
0a3ca62f53
Merge pull request #270 from Tastyfish/master
...
Made custom items read from a config file.
2012-01-12 01:02:00 -08:00
Tastyfish
a85e8eee50
Merge pull request #271 from caelaislinn/master
...
conveyors on the mini mining outposts should now work properly
2012-01-11 23:03:00 -08:00
SkyMarshal
54d3184f2a
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-01-11 18:13:35 -07:00
SkyMarshal
a47b399c32
Fixed bugs involving wrapping yourself in a closet. Added a new centcom uniform sprite, and added checks to keep them looking pretty. Added a cancel button to deathsquad button. Adjusted admin spawnable complete uniforms, so that centcom officials look pimp'n. Added a layer of internal armor (special invisible exosuit) that spawns on centcom officials. Centcom berets are no longer space helmets. Added missing reactive teleport armor sprite and fixed it's functionality.
2012-01-11 18:13:02 -07: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
