25f7741772
Fixed a UI bug caused by the lack of var/over = 1 for PDAs
2012-01-12 16:58:46 +02:00
0a3ca62f53
Merge pull request #270 from Tastyfish/master
...
Made custom items read from a config file.
2012-01-12 01:02:00 -08:00
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
54d3184f2a
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-01-11 18:13:35 -07:00
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
7f00b759c4
Merge remote-tracking branch 'upstream/master'
2012-01-11 16:27:37 -05:00
0c22767896
fixed meteor to actually hit the station with meteors
2012-01-11 16:27:14 -05:00
dc87ddc766
Missed a flag
2012-01-11 12:42:29 -07:00
3d9658178a
Removed space capability from captain's armor.
...
Added memo on his desk informing him.
2012-01-11 12:34:45 -07:00
3c5cc5f3b3
Fixed some broken sprites and odd behavior of the Reactive Teleport Armor
2012-01-11 12:29:59 -07:00
66322d580c
Bugfix for implanters.
2012-01-11 11:26:56 -07:00
279351c18f
- Pepper spray and the Grenade-Launcher have been removed until the various bugs with them are fixed.
...
(authourised by head-coder peoples)
- Remapped the firing-range a little to help keep the armoury a little more secure.
- Removed the bar-stool that was spawning under the disposal in the bar.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2944 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-11 17:11:38 +00:00
5d39c6058b
Fixed bug with busting out of packages.
2012-01-11 10:01:42 -07:00
a8ea86e2c1
Merge pull request #263 from SkyMarshal/master
...
Bugfix for rad storms being insane.
2012-01-10 22:16:02 -08:00
7675472393
Bugfix for radiation belts being insane.
2012-01-10 23:14:43 -07:00
f922994c71
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
code/modules/recycling/sortingmachinery.dm
2012-01-11 00:26:42 -05:00
299947a4b8
added body scanner to check organs
2012-01-11 00:24:42 -05:00
12a9c075c8
added overlays for labelled and tagged packages
2012-01-11 00:24:02 -05:00
bf3e668071
Merge branch 'master' of git://github.com/Baystation12/Baystation12
2012-01-10 21:57:42 -07:00
ba24236380
Ported filing cabinet and photo copier.
2012-01-10 21:49:58 -07:00
25e1633487
Merge pull request #259 from Tastyfish/master
...
Took long enough to fix this damn bug.
2012-01-10 20:39:05 -08:00
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
3494003d68
Merge branch 'master' of git://github.com/Baystation12/Baystation12
2012-01-10 21:36:35 -07:00
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
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
763c9ec07b
paint is reagent, fixed ai core bug
2012-01-10 18:05:19 -05:00
f36c56f5c7
Disposal updates, fixed a messed up maintenance door.
2012-01-10 15:37:42 -07:00
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
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
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
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
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
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
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
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
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
56ee73e22a
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-01-09 21:59:50 +02:00
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
25426e6f02
Merge pull request #254 from SkyMarshal/master
...
Bugfix.
2012-01-09 09:08:53 -08:00
e455f46cfd
More bugfixing
2012-01-09 10:08:11 -07:00
46fb684c0b
Bugfix for chem grenades and Disposals.
2012-01-09 09:58:33 -07:00
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
50bca2ebff
Merge pull request #253 from Tastyfish/master
...
fixed html lines
2012-01-09 03:56:15 -08:00
12675d12d2
fixed bad html on pain text
2012-01-09 06:54:19 -05:00
f38406ec20
Merge pull request #252 from SkyMarshal/master
...
Fixed bible, medibots, added kitchen packager, ported TTP
2012-01-08 23:19:03 -08:00
6cdae453b2
Merge pull request #249 from caelaislinn/master
...
made body bads orderable via qm
2012-01-08 23:07:32 -08:00
9b8e24c9d1
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-01-09 07:45:56 -08:00
80f8c70e09
Band-aids and ointment work until 0 health, rather than 50 now.
2012-01-09 07:45:00 -08:00
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
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
Albert Iordache
