Uristqwerty
1f27f092a8
This might make A* work better, since BS12 doesn't have diagonal movement.
2012-01-15 04:07:06 -05:00
Uristqwerty
20dee7e71a
This might make A* work better.
2012-01-15 04:05:30 -05:00
Tastyfish
1dbc4997fb
put filing cabinet in correct path in tg standards
2012-01-14 00:54:58 -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
Albert Iordache
8de86927f8
Merge pull request #272 from Miniature/master
...
Made hydroponics happen 5 times slower
2012-01-12 11:28:57 -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
Miniature
79b4e56971
Made hydroponics happen 5 times slower, current rate means you have no time to do anything
...
This is entirely a guess at the correct speed and will likely require further changes
2012-01-13 00:57:27 +10:30
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
9e5925b1f9
fixed custom items loaded and custom_items.txt
2012-01-12 01:54:27 -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
e5abd35dae
made custom items read from a config file
2012-01-12 01:47:55 -05:00
Tastyfish
abefe71bba
fixed derpy bug in spawning right dismembered foot
2012-01-12 01:47:15 -05:00
Tastyfish
a8e8af6242
Merge pull request #269 from SkyMarshal/master
...
Fixed bugs with wrapping yourself in a closet, new CentCom uniforms, reactive teleport armor now works and has a sprite, fixed implanter issues.
2012-01-11 22:32:43 -08: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
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
Tastyfish
7f00b759c4
Merge remote-tracking branch 'upstream/master'
2012-01-11 16:27:37 -05:00
Tastyfish
0c22767896
fixed meteor to actually hit the station with meteors
2012-01-11 16:27:14 -05: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
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
a8ea86e2c1
Merge pull request #263 from SkyMarshal/master
...
Bugfix for rad storms being insane.
2012-01-10 22:16:02 -08:00
SkyMarshal
7675472393
Bugfix for radiation belts being insane.
2012-01-10 23:14:43 -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
299947a4b8
added body scanner to check organs
2012-01-11 00:24:42 -05:00
Tastyfish
12a9c075c8
added overlays for labelled and tagged packages
2012-01-11 00:24:02 -05:00
SkyMarshal
bf3e668071
Merge branch 'master' of git://github.com/Baystation12/Baystation12
2012-01-10 21:57:42 -07:00
SkyMarshal
ba24236380
Ported filing cabinet and photo copier.
2012-01-10 21:49:58 -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
3494003d68
Merge branch 'master' of git://github.com/Baystation12/Baystation12
2012-01-10 21:36:35 -07: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
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
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
