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
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
1d632c0666
Compiling fix
2012-02-16 19:06:04 +02: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
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
4ce36641ea
Merge remote-tracking branch 'upstream/master'
2012-02-15 20:06:49 -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
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
CaelAislinn
95b521dede
Merge branch 'master' of git://github.com/Baystation12/Baystation12
2012-02-15 07:04:43 +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
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
Miniature
006e91f4c1
Made dexalin and cloneoxadone use a slight amount of plasma, in addition to requiring it as a catalyst.
...
No, it doesn't make sense for oxygen being in the presence of plasma to transmute into dexalin.
2012-02-13 23:15:23 +10:30
SkyMarshal
6cb78379c3
Fixes for DOOMFIRES.
2012-02-12 15:00:43 -07:00
Albert Iordache
d848f7195a
Small optimizations to metroid AIprocess()
2012-02-12 22:06:43 +02:00
SkyMarshal
c2e4a64201
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-02-12 12:48:16 -07:00
SkyMarshal
3d284270f7
Fix for command reports and hacktools.
2012-02-12 12:47:36 -07:00
Tastyfish
aeafc2ffa5
can eat all foods with fork like a sane person now
2012-02-12 07:07:16 -05:00
Tastyfish
b0815b8e1d
Merge pull request #402 from CIB/master
...
Space carp fixes
2012-02-12 02:54:35 -08:00
cib
36801aecec
mend
2012-02-12 11:51:00 +01:00
cib
d21de6271c
Space carp and other critter balancing.
...
They're less likely to attack and move slower now.
2012-02-12 11:48:15 +01:00
Tastyfish
9ccc91f3ae
Merge pull request #396 from Abi79/master
...
Skipping computer ID checks for bans
2012-02-10 15:15:58 -08:00
SkyMarshal
80eae068fd
Merge pull request #400 from Tastyfish/master
...
rejuvinate resets body temp, stabilize atmos restabilizes a chosen area
2012-02-10 15:15:21 -08:00
Albert Iordache
a6f89fefee
Merge pull request #398 from caelaislinn/master
...
new custom items
2012-02-10 14:32:38 -08:00
Tastyfish
bc2817a0a4
rejuvinate resets body temp, stabilize atmos restabilizes a chosen area's atmos
2012-02-10 17:15:50 -05:00
CaelAislinn
0edd231592
added new custom items
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-02-11 07:24:50 +10:00
Albert Iordache
a28ade459a
Small fix.
2012-02-10 21:09:34 +02:00
Albert Iordache
1f1ea35a75
Added a way to skip the computer ID check for bans, and cleaned up the code a bit
2012-02-10 21:01:20 +02:00
Tastyfish
bd6fbb5fe8
fix to sky's reagent effects changes
2012-02-10 00:07:29 -05:00
SkyMarshal
1d29574bc3
Part 2 of the WIP chemistry stuff
...
Map update with secure doors!
2012-02-09 21:50:50 -07:00
SkyMarshal
90d47bccf9
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-02-09 16:29:31 -07:00
SkyMarshal
48453a3592
WIP work in making welding fuel not retarded
...
Chem grenades are now awesome again.
2012-02-09 16:29:06 -07:00
CIB
03aea121d8
Merge pull request #384 from caelaislinn/master
...
department lockers, other stuff
2012-02-09 15:23:55 -08:00
CaelAislinn
03f970de65
Merge branch 'master' of git://github.com/Baystation12/Baystation12
...
Conflicts:
code/game/objects/closets/secure/engineering.dm
maps/tgstation.2.0.8.dmm
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-02-10 09:11:08 +10:00
SkyMarshal
90affc2bfc
Merge pull request #392 from CIB/master
...
Fixes to shock-crit and co
2012-02-09 14:45:47 -08:00
