Commit Graph

8886 Commits

Author SHA1 Message Date
SkyMarshal
fbf59a3411 Fix compile error. 2012-01-02 10:08:30 -07:00
Albert Iordache
bdd5205bfe Merge pull request #196 from SkyMarshal/master
PDAs can now fit in all belts
2012-01-02 09:04:45 -08:00
SkyMarshal
2f0a745815 PDAs can now fit into all belts. 2012-01-02 10:01:57 -07:00
Tastyfish
4de9164a5b Merge remote-tracking branch 'upstream/master' 2012-01-02 11:47:20 -05:00
Tastyfish
87a14c0674 machine ingredient adding more intuitive 2012-01-02 11:46:19 -05:00
Tastyfish
bf877d0483 Merge pull request #191 from SkyMarshal/master
Nuclear revamp, full details in description.
2012-01-02 08:18:25 -08:00
SkyMarshal
6537219768 Explosive implants should go off more reliably. 2012-01-02 09:09:43 -07:00
Miniature
806a8d1c1a First bunch of emlocker stuffs, going to fix when its not 1am and 24C 2012-01-03 01:38:01 +10:30
Tastyfish
024120e4a3 Merge pull request #193 from Abi79/master
TG conveyor2 update
2012-01-02 06:37:53 -08:00
Albert Iordache
d9683ef4e3 Merge pull request #192 from caelaislinn/master
Autolathe changes, new supply crates, slight cargo bay tweaks
2012-01-02 06:36:03 -08:00
Albert Iordache
72941bb8c9 Merge pull request #190 from Tastyfish/master
fixed cult low-player problem, piano movable, straight jackets
2012-01-02 06:17:58 -08:00
petethegoat@gmail.com
ee7cd1474e TG update: Added corner conveyor belts.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2693 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-02 15:52:10 +02:00
Tastyfish
2d91693a3b Merge remote-tracking branch 'cael/master' 2012-01-02 08:49:52 -05:00
CaelAislinn
fe228850c8 Added old BS12 walllockers and emergency lockers, added emergency lockers to tgstation208.dmm, removed stamp eraser from supply crate, minor antiqua tweaks
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-01-02 23:47:28 +10:00
Tastyfish
8000b5be66 why did I make an afterthought commit changing it to the wrong thing.. 2012-01-02 08:40:56 -05:00
Tastyfish
e2a6f68e00 Merge remote-tracking branch 'cael/master' 2012-01-02 07:43:23 -05:00
CaelAislinn
2bc92e68eb Fixed so autolathe quantity can't be set to negative, ported over emergency walllockers from old bs12
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-01-02 22:42:04 +10:00
Tastyfish
f85b922184 Merge remote-tracking branch 'cael/master' 2012-01-02 07:22:53 -05:00
Tastyfish
e16b1dec3f Merge remote-tracking branch 'upstream/master' 2012-01-02 07:22:29 -05:00
CaelAislinn
9fa489a0d1 finished autolathe changes. added stationary, box and empty supply crates to supply shuttle.
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-01-02 21:38:27 +10:00
Tastyfish
32492a51fe fixed edit-appearence to assign hair and facial style correctly. somehow I didn't notice it wasn't changing in testing :p 2012-01-02 06:33:59 -05:00
Albert Iordache
15aeca6213 Fixed a case where "none" was set as a gamemode by a vote 2012-01-02 12:28:35 +02:00
CaelAislinn
083de044f3 Added production quantities and the ability to load + fill containers to the autolathe.
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-01-02 20:19:15 +10:00
Tastyfish
1feb16439e can get out of straight jacket after 4 byond minutes now (better than infinity) 2012-01-02 04:54:19 -05:00
VivianFoxfoot@gmail.com
25d107d9e2 Decreases door crush damage to 20
Now adds blood on the floor where someone was crushed.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2900 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-02 09:39:48 +00:00
VivianFoxfoot@gmail.com
bf56fc6e99 Doors no longer close if there is a mob in the tile, a door can be hacked/AI overriden to close anyways and injure that mob as well as knock them down so they can be crushed again and again until they stop moving. (Currently: 35 brute and knockdown.)
The server master log now records attacks / emotes / PDA messages, as well as timestamping.  

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2899 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-02 08:42:44 +00:00
quartz235@gmail.com
e0b19c9ce3 Fixed issue 287, 290, 291
-Cutting/restoring cameras now leaves a print
-building certain overly-abused griff items leaves prints
-grenade launcher no longer shoots your face if you try to backpack it

Chameleon projector movement speed is now based on temperature
Added add_hiddenprint(mob) proc
it's like add_fingerprint but only adds to fingerprintshidden isn't that neat?

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2898 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-02 07:57:37 +00:00
Tastyfish
00a86accfa Merge pull request #188 from caelaislinn/master
Antiqua changes + first official contribution :3
2012-01-01 23:53:29 -08:00
Tastyfish
6cf377a25d Merge remote-tracking branch 'cael/master' 2012-01-02 02:30:41 -05:00
SkyMarshal
15d2f06762 pAI's in PDA's can now hear things, hypothetically. 2012-01-02 00:23:43 -07:00
CaelAislinn
c6fda41758 tweaked cargo bay conveyors
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-01-02 17:04:18 +10:00
CaelAislinn
e0ae00b254 reduced electrical storm epicentre radius to 10, from 25
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-01-02 16:05:08 +10:00
SkyMarshal
78762e3c25 Fixed a good bit of stupid I made, forgot to remove some debugging stuff. 2012-01-01 22:30:48 -07:00
SkyMarshal
b30da1fa98 Some fixes and improvements. 2012-01-01 22:29:04 -07:00
SkyMarshal
d64e8284f6 Fixed implanter problems, added some more silly emotes. 2012-01-01 19:57:57 -07:00
SkyMarshal
d2bae46c39 Changed functionality of implanter. 2012-01-01 19:25:02 -07:00
SkyMarshal
755d2d711a Nuke revamp, some tweaking. 2012-01-01 18:58:28 -07:00
CaelAislinn
bae12d0bda Added the antiqua cargo bay (in the right place this time), also added a moving parts sign to obj.dm
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-01-02 11:07:05 +10:00
Tastyfish
381647971c it doesn't get stuck in things that don't have hands, like silicons now 2012-01-01 19:57:01 -05:00
mport2004@gmail.com
c4b181ad98 The blob can now break canisters
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2897 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-02 00:56:37 +00:00
mport2004@gmail.com
c6d42b77be Hmm somehow flipped the close/open icon.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2896 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-01 23:55:05 +00:00
mport2004@gmail.com
8c1c914259 Added Invisty's Emitter sprites.
Cleaned up part of the door code and moved some defines to their proper files.
Firelocks can now be welded open and now shows the welded overlay properly.
Borgs can now properly mess with door wiring.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2895 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-01 23:43:56 +00:00
Superxpdude@gmail.com
eee1ffd7c9 Added a special practice laser gun to the firing range.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2894 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-01 22:56:20 +00:00
Tastyfish
698a9eddbd Merge remote-tracking branch 'upstream/master' into HEAD 2012-01-01 16:45:56 -05:00
Tastyfish
343832e431 made it so nar-sie can't be objective if < 10 players, due to it being impossible
also, made piano moveable
and cleaned up custom vote code slightly more
2012-01-01 16:44:57 -05:00
vageyenaman@gmail.com
c0b4ff00c2 Fix for Issue 276. Pregame music stops playing for AIs.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2893 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-01 21:19:37 +00:00
Albert Iordache
6b16ac377b Merge pull request #189 from CIB/master
Vira updates
2012-01-01 13:05:21 -08:00
cib
40fb4bb628 Mucus and a few fixes to vira.
Added mucus that is added to the map sometimes when sneezing or coughing. Blood now carries the spiller's virus2. Fixed a problem with virus spreading.
2012-01-01 20:50:46 -08:00
Albert Iordache
aa4f30bbef Minor deathgasp fix. 2012-01-01 22:48:53 +02:00
Albert Iordache
17449d0881 Re-enabled the deathgasp, because it activates traitor implants. 2012-01-01 22:46:37 +02:00