SkyMarshal
b0eebb2edb
Reverted some layer adjustments I did that seem to have broken things, bugfixes for operating tables, choking people, and CPR, giving. Also added sterile mask box sprite, and tossed the singularity crap into a spawn(0) to try and reduce lag.
2012-02-17 12:56:46 -07:00
SkyMarshal
eaf198539f
Fixed some f-d up paths.
2012-02-17 12:56:45 -07:00
Miniature
aa392b8e7a
Merge pull request #444 from Miniature/master
...
Made labels able to be stuck on containers (issue #430 )
2012-02-17 11:10:59 -08:00
Miniature
44e4c6a332
Made labels able to be stuck on containers (issue #430 )
2012-02-18 05:39:30 +10:30
Miniature
95238211f4
Merge pull request #441 from Miniature/master
...
I am an idiot, fixing chemmaster runtime
2012-02-17 00:44:30 -08:00
Miniature
c612f91430
I am an idiot, fixing chemmaster runtime
2012-02-17 19:13:39 +10:30
Albert Iordache
8d418f926a
Renamed "Display job bans" to "Unjobban Panel"
2012-02-16 22:53:51 +02:00
Albert Iordache
2da261c147
Mess hall reorganization
2012-02-16 22:33:37 +02:00
Albert Iordache
7d3ddeb9f6
Merge pull request #438 from melonstorm/master
...
Scientist lockers fixed, captain's PDA now doesn't have messaging turned off by default.
2012-02-16 12:18:48 -08:00
Melvin Melonstorm
afc3c1f861
Merge branch 'master' of github.com:melonstorm/Baystation12
2012-02-16 20:29:46 +01:00
Albert Iordache
bd46c3fb29
Bar maintenance fix
2012-02-16 20:28:46 +01:00
Melvin Melonstorm
f72d222d2f
Removed map change because I hadn't locked the map. My change to it
...
doesn't really matter.
2012-02-16 20:15:27 +01:00
Melvin Melonstorm
8c0290bce0
FINALLY made the captain's PDA not start out with messaging disabled,
...
and also fixed Scientist's closets, probably. Added a missing window in
the map.
2012-02-16 19:40:58 +01:00
Albert Iordache
7274451e1d
Bar maintenance fix
2012-02-16 19:07:52 +02:00
Albert Iordache
1d632c0666
Compiling fix
2012-02-16 19:06:04 +02:00
CIB
1bdde438e5
Merge pull request #435 from AppleMaster/master
...
Random barsigns.
2012-02-16 08:37:01 -08:00
Albert Iordache
cc6c63edd7
Merge pull request #423 from caelaislinn/master
...
added a couple of new clothing items, updated some sprites
2012-02-16 08:29:15 -08:00
Albert Iordache
0d19e9c7b3
Merge pull request #434 from Miniature/master
...
Added a thing to select pill and bottle sprites to the chemmaster
2012-02-16 08:21:13 -08:00
Jimapples
ecc25f0580
Added randomised barsigns, again!
...
Signed-off-by: Apples <chicken_face@ymail.com >
2012-02-16 15:35:21 +00:00
Miniature
9efde25a60
Added a thing to select pill and bottle sprites to the chemmaster
...
At some point I'd like to see bottles doing the same thing as beakers, where they show what chemicals are in them on the sprite. That however would involve messing with sprites and overlays and stuff, so I can't be bothered to actually do it at the moment. Just remember that this stuff will need to be changed for that.
2012-02-17 01:15:36 +10:30
SkyMarshal
8769fdd3fc
Merge pull request #432 from Tastyfish/master
...
ported in a bunch of the old food making stuff
2012-02-15 19:11:30 -08:00
Tastyfish
9377df7285
Merge pull request #431 from SkyMarshal/master
...
Replaceing old pull request. It got merged by accident and I reverted it.
2012-02-15 17:12:48 -08:00
Tastyfish
f32bae45b2
Merge pull request #429 from laser50/master
...
Genetics change
2012-02-15 17:10:59 -08:00
Tastyfish
4ce36641ea
Merge remote-tracking branch 'upstream/master'
2012-02-15 20:06:49 -05:00
Tastyfish
7149b98a9d
improved library code
2012-02-15 20:06:24 -05:00
Tastyfish
c74c9b48e9
fix capsicum and frost oil to make sense
2012-02-15 14:46:35 -05:00
Tastyfish
cb5907efb4
furthur tweaks
2012-02-15 14:28:14 -05:00
SkyMarshal
58d7da9008
Missing blood_DNA now goes into admin logs and stuff.
2012-02-15 10:26:22 -07:00
Wouter Boetje
f38c0d074e
increased size of Genetics, using it to it's full capacity. Added one patient room. Because the morgue was just far to big. Workspace for 2 is avalible, now.
2012-02-15 17:55:00 +01:00
CaelAislinn
6ddbb9097b
added missing file
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-02-15 17:17:03 +10:00
SkyMarshal
b5c1d99471
Added some more feedbacks on the blood_DNA stuff
...
Fixed up some chemistry stuff
Nitrogen now adds atmospheric nitrogen when splashed on the ground.
2012-02-14 21:34:52 -07:00
SkyMarshal
5e332d297d
Added a sanity check, added some feedback stuff to help identify WTF is happening with blood.
2012-02-14 19:58:21 -07:00
Wouter Boetje
bac2fbe052
Updated genetics to use it's room to the fullest. More space now.
2012-02-15 00:33:21 +01:00
CaelAislinn
95b521dede
Merge branch 'master' of git://github.com/Baystation12/Baystation12
2012-02-15 07:04:43 +10:00
CaelAislinn
43ead88027
fixes to new clothing
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-02-15 07:04:26 +10:00
CaelAislinn
9d798d3f95
updated some sprites, added new clothing
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-02-15 06:58:50 +10:00
CIB
9d12cf6c12
Merge pull request #422 from SkyMarshal/master
...
More update_clothing() calls.
2012-02-14 11:15:42 -08:00
SkyMarshal
7e140afe56
Added more update_clothing() calls
2012-02-14 12:12:42 -07:00
Tastyfish
badb7bd93f
Merge remote-tracking branch 'upstream/master'
2012-02-14 12:01:14 -05:00
Tastyfish
12d119c109
porting old food stuff
2012-02-14 11:59:16 -05:00
Albert Iordache
86be3a959b
Merge pull request #418 from Miniature/little_things_thread
...
Made lights repairable, wire->screwdriver
2012-02-14 04:30:34 -08:00
Albert Iordache
aa04eed7e8
Merge pull request #417 from SkyMarshal/master
...
Should reduce lag, mobs no longer update icons ever tick.
2012-02-14 04:20:00 -08:00
SkyMarshal
2a0bb6e822
Merge pull request #407 from Abi79/master
...
Small optimizations to metroid AIprocess()
2012-02-14 02:57:05 -08:00
SkyMarshal
3a2beedb15
Merge pull request #412 from Miniature/master
...
Reduced max positions for a bunch of jobs
2012-02-14 02:56:52 -08:00
Miniature
a86e2ed94e
Made lights repairable, wire->screwdriver
...
Also glass to make broken ones into burnt ones, independent of rewiring
2012-02-14 18:08:28 +10:30
SkyMarshal
f59fb6af94
More updates, added comfy chairs.
2012-02-13 23:28:12 -07:00
SkyMarshal
0fe42327a5
This should hopefully reduce processing requirements, by not rebuilding icons every tick.
...
(Ported oldcode, all props to Strumpetplaya)
2012-02-13 21:54:22 -07:00
SkyMarshal
3fbcbfe448
Merge pull request #416 from SkyMarshal/master
...
Bugfixes for Borg&Doors
2012-02-13 15:58:17 -08:00
SkyMarshal
42be0feff6
Bugfix for borgs&doors as well as chem grenades.
2012-02-13 16:56:34 -07:00
Mloc
7ad2034eb8
Merge pull request #415 from Mloc/master
...
whoops
2012-02-13 14:09:56 -08:00
