Commit Graph

10100 Commits

Author SHA1 Message Date
rockdtben
90bafc9731 -Admins can now adjust damage easily. http://rockdtben.com/files/ss13/prototype4.png
-Also it refreshed automatically whenever you change any of the damage vars up there.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2943 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-10 23:44:41 +00: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
mport2004@gmail.com
037768b7b1 One more san check.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2942 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-10 22:23:27 +00:00
quartz235@gmail.com
26a2f20340 Runtimes are funtimes!
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2941 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-10 22:21:26 +00:00
mport2004@gmail.com
188dfb526e Fixed a few runtimes.
Moved the all player mobs death check into the parent death proc.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2940 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-10 22:13:06 +00:00
trubblebass@gmail.com
1ea40a5e48 - Oops, forgot to remove the old file
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2938 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-10 17:21:38 +00:00
trubblebass@gmail.com
13d729577d - Changed /trunk/code/game/objects/closets/fireax.dm to fireaxe.dm
- Fixed issue 308
Singularity engine parts are now unanchored by default. However those on the map have been edited to all be anchored.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2937 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-10 17:20:46 +00:00
polyxenitopalidou@gmail.com
6db3b3239b •Fixed bug with fireax (who corrected it from fireaxe? Thanks :3) closets becoming invisible.
Thanks, LJ.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2936 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-10 13:06:10 +00: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
rockdtben
2f2c4e98a6 Just adding a proc that I am going to use in the organ system soon.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2935 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-09 14:51:29 +00: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
panurgomatic
3942358580 - Reworked exosuit atmospherics
- Combat exosuits melee won't gib dead mobs
- QM exosuit circuit crates cost lowered to 30 points
- Exosuit plasma converter generates 15 power per tick (was 10)
- Exosuit internal tank connected to atmos port now will update contents

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2934 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-09 04:04:03 +00:00
quartz235@gmail.com
cefb9c8217 - Updated .dme from polymorph's area defines thingy
- Per XSI's request (and Muskets' consent,) toggle OOC color is now a Game Admin level command (as opposed to Game Master.)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2933 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-09 01:48:59 +00:00
vageyenaman@gmail.com
2f92ba494e Possibly the finishing touches to the telecomms prototype. They will be included in the game soon-ish.
Some work on critters. Added a new critter type: the VISCERATORS. (http://dl.dropbox.com/u/10657252/SS13/Manhacks.PNG) Includes a small new audio file. They'll probably be created with a traitor item or a box-o-hacks in the armory.



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2932 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-09 01:48:38 +00: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
kortgstation@gmail.com
08edb890c9 Added the new security locker sprites by Ricotez (well mostly, he forgot to make the emag sparking set, but that was just copypasting anyway)
Commented out Agouris shitty code that caused compile errors.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2930 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-08 21:40:42 +00:00
VivianFoxfoot@gmail.com
145a370111 Adds two new vars to door_control.dm, normaldoorcontrol and range
If normaldoorcontrol is set, checks the id_tag of all airlocks in range against its ID and opens it if they match.  Currently only opens.  
Adds buttons to open medbay foyer and genetics.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2929 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-08 20:32:29 +00: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
polyxenitopalidou@gmail.com
091936f0b5 •Softcaps, flippable
•Improved bodybags, also changed sprites. Scream at me if you don't like them, I'll change them back. Also sorry for the 114KB new sound.
•Sorry but I really have to defecate while writing this

•You can find the unused newscaster sprite of my new project in terminals.dmi

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2928 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-08 17:44:32 +00: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
VivianFoxfoot@gmail.com
4ef0251aad Moves the areas procs all into the same file.
Comments out an if statement to supress a warning.
Although not yet located on the map, adds the code for gravity generators.
Actually enables attack logging by default, now.  


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2927 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-08 08:47:54 +00:00
VivianFoxfoot@gmail.com
1f29357168 Adds logging in the form of an attack log.log (now enabled by default)
You can now drag PDAs onto yourself to open the screen
Disables the fire damage causing husking.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2926 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-08 03:30:25 +00: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