SkyMarshal
81e9d3cf68
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-01-20 16:41:29 -07:00
SkyMarshal
94c38b8206
Fixed book titles not showing up properly in some instances, Death alarm is now labeled as such, robot lighter works right.
2012-01-20 16:40:55 -07:00
SkyMarshal
6e34145dac
Removed debugging prompt stuff.
2012-01-20 14:30:24 -07:00
SkyMarshal
722bbee324
Interaction window now updates properly.
2012-01-20 14:27:29 -07:00
SkyMarshal
e806e95f79
Working to make the inventory auto refresh.
2012-01-20 13:15:50 -07:00
SkyMarshal
1bf1d5db1f
Pimped out the response team. No jobs have stupid stuff spawn in their hands, it now spawns on their person, be it on their ear (pens if they cannot find a target) of in their pockets. MAde several pre-set-up things for the response team, including portable surgery equipment and a movable optable. Made autolathe items spawn on top of it. Added Death alarms, and made explosive implants work properly. Girders are now removed when a floor is made/RCD'd into existence. Internals can now be set even if it is in suit storage or on the belt.
2012-01-20 12:53:29 -07: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
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
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
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
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
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
3c5cc5f3b3
Fixed some broken sprites and odd behavior of the Reactive Teleport Armor
2012-01-11 12:29:59 -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
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
ce9042ae20
bones and dismemberment
2012-01-08 20:05:54 -05: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
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
Tastyfish
a7b85707dd
porting in bones and dismemberment
2012-01-05 17:15:29 -05:00
Tastyfish
a2ff049861
merge
2012-01-04 23:01:22 -05:00
cib
e141f962c4
Confusion shouldn't make you totally unable to move in one direction.
2012-01-04 22:32:09 -08:00
Miniature
a898a49c3c
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-01-04 17:00:34 +10:30
Miniature
c9a20d7a12
another runtime
2012-01-04 16:57:40 +10:30
Albert Iordache
33833b9acb
Merge pull request #202 from SkyMarshal/master
...
OHMYGOD I coded a ton.
2012-01-03 11:14:20 -08:00
Miniature
499198b1cf
More runtime fixing
2012-01-04 04:36:21 +10:30
SkyMarshal
72c6369368
Merge branch 'master' of git://github.com/Baystation12/Baystation12
2012-01-02 21:49:09 -07:00
SkyMarshal
411ccc4075
Shitload of stuff.
2012-01-02 21:48:42 -07:00
Tastyfish
3c15526e3f
accidentally called the wrong unequip proc, they're all so similar!
2012-01-02 12:52:09 -05:00
Tastyfish
bf877d0483
Merge pull request #191 from SkyMarshal/master
...
Nuclear revamp, full details in description.
2012-01-02 08:18:25 -08:00
SkyMarshal
6537219768
Explosive implants should go off more reliably.
2012-01-02 09:09:43 -07:00
Tastyfish
1feb16439e
can get out of straight jacket after 4 byond minutes now (better than infinity)
2012-01-02 04:54:19 -05:00
SkyMarshal
15d2f06762
pAI's in PDA's can now hear things, hypothetically.
2012-01-02 00:23:43 -07:00
SkyMarshal
b30da1fa98
Some fixes and improvements.
2012-01-01 22:29:04 -07:00
SkyMarshal
d64e8284f6
Fixed implanter problems, added some more silly emotes.
2012-01-01 19:57:57 -07:00
