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
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
SkyMarshal
ef45b6128c
Fixed some UI stuff.
2012-01-11 20:40:41 -07:00
cib
a7b188a201
Bug fix: Tramadol pill bottle spawned empty, and kelatone pill bottle spawned with tramadol.
2012-01-11 18:03:19 -08: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
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
66322d580c
Bugfix for implanters.
2012-01-11 11:26:56 -07:00
SkyMarshal
5d39c6058b
Fixed bug with busting out of packages.
2012-01-11 10:01:42 -07:00
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
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
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
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
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
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
SkyMarshal
7dec599f9b
Fixed medibot stupidity and bible shit.
2012-01-09 00:06:57 -07:00
Tastyfish
58c3d6ebe3
cleaned up brain transfer
2012-01-09 01:24:42 -05: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
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
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
40a0a5499e
Bugfix for some table stuff I forgot.
...
Fixed a small message for writing on paper.
2012-01-07 10:51:32 -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
68070d9061
Bugfixes for cloning and the mail sorting machinery.
2012-01-06 11:38:56 -07:00
SkyMarshal
3be149b2b3
Fixes discussed on IRC. Fixed a broken sort junction I miseed. (Thanks tasty!)
2012-01-05 15:44:28 -07: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
Albert Iordache
53d989dda2
Merge pull request #224 from CIB/master
...
Medical stuff
2012-01-05 12:22:19 -08:00
cib
9e035424da
Nerfed the medbot and bruise packs.
2012-01-05 19:36:26 -08:00
SkyMarshal
fbd4004781
Merge pull request #223 from SkyMarshal/master
...
Bugfix/tweak
2012-01-05 09:33:42 -08:00
SkyMarshal
86b42f815f
Tweaked garble-ness on radios in other Z-levels
2012-01-05 10:31:42 -07:00
cib
1f9797934e
Made the explosionfar sound occur more often.
2012-01-05 17:39:13 -08:00
Tastyfish
a2ff049861
merge
2012-01-04 23:01:22 -05:00
SkyMarshal
b2e25d39b8
This should work, not sure.
...
Signed-off-by: SkyMarshal
2012-01-04 11:08:47 -07:00
Albert Iordache
33833b9acb
Merge pull request #202 from SkyMarshal/master
...
OHMYGOD I coded a ton.
2012-01-03 11:14:20 -08:00
Albert Iordache
08ab4448b8
Merge pull request #194 from Miniature/master
...
bunch of emlocker stuffs, also a couple of runtimes
2012-01-03 09:03:18 -08:00
Miniature
8aba29cc9c
Fixing some null runtimes
2012-01-04 03:15:20 +10:30
Miniature
9a81f4496b
Finished emlocker stuff
...
if someone wants to move where the spawning is done feel free
2012-01-04 02:15:38 +10:30
SkyMarshal
9a651a5a84
Added psyche jumpsuit for Asanadas
...
Expanded scrambled radio stuff.
2012-01-03 00:06:25 -07:00
SkyMarshal
411ccc4075
Shitload of stuff.
2012-01-02 21:48:42 -07:00
SkyMarshal
fbf59a3411
Fix compile error.
2012-01-02 10:08:30 -07:00
SkyMarshal
2f0a745815
PDAs can now fit into all belts.
2012-01-02 10:01:57 -07:00
Tastyfish
bf877d0483
Merge pull request #191 from SkyMarshal/master
...
Nuclear revamp, full details in description.
2012-01-02 08:18:25 -08:00
Miniature
806a8d1c1a
First bunch of emlocker stuffs, going to fix when its not 1am and 24C
2012-01-03 01:38:01 +10:30
