2d91693a3b
Merge remote-tracking branch 'cael/master'
2012-01-02 08:49:52 -05:00
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
8000b5be66
why did I make an afterthought commit changing it to the wrong thing..
2012-01-02 08:40:56 -05:00
e2a6f68e00
Merge remote-tracking branch 'cael/master'
2012-01-02 07:43:23 -05:00
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
f85b922184
Merge remote-tracking branch 'cael/master'
2012-01-02 07:22:53 -05:00
e16b1dec3f
Merge remote-tracking branch 'upstream/master'
2012-01-02 07:22:29 -05:00
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
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
15aeca6213
Fixed a case where "none" was set as a gamemode by a vote
2012-01-02 12:28:35 +02:00
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
1feb16439e
can get out of straight jacket after 4 byond minutes now (better than infinity)
2012-01-02 04:54:19 -05:00
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
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
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
00a86accfa
Merge pull request #188 from caelaislinn/master
...
Antiqua changes + first official contribution :3
2012-01-01 23:53:29 -08:00
6cf377a25d
Merge remote-tracking branch 'cael/master'
2012-01-02 02:30:41 -05:00
15d2f06762
pAI's in PDA's can now hear things, hypothetically.
2012-01-02 00:23:43 -07:00
c6fda41758
tweaked cargo bay conveyors
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-01-02 17:04:18 +10:00
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
78762e3c25
Fixed a good bit of stupid I made, forgot to remove some debugging stuff.
2012-01-01 22:30:48 -07:00
b30da1fa98
Some fixes and improvements.
2012-01-01 22:29:04 -07:00
d64e8284f6
Fixed implanter problems, added some more silly emotes.
2012-01-01 19:57:57 -07:00
d2bae46c39
Changed functionality of implanter.
2012-01-01 19:25:02 -07:00
755d2d711a
Nuke revamp, some tweaking.
2012-01-01 18:58:28 -07:00
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
381647971c
it doesn't get stuck in things that don't have hands, like silicons now
2012-01-01 19:57:01 -05:00
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
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
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
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
698a9eddbd
Merge remote-tracking branch 'upstream/master' into HEAD
2012-01-01 16:45:56 -05:00
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
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
6b16ac377b
Merge pull request #189 from CIB/master
...
Vira updates
2012-01-01 13:05:21 -08:00
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
aa4f30bbef
Minor deathgasp fix.
2012-01-01 22:48:53 +02:00
17449d0881
Re-enabled the deathgasp, because it activates traitor implants.
2012-01-01 22:46:37 +02:00
205ad71ee6
Made atmos control show name of alarm, coloured active alarms in list, added to map
2012-01-02 03:18:06 +10:30
10401563e2
Atmos control computer
...
Lets you use atmos alarms from atmospherics, if people press a button on the alarm
Not added to map
2012-01-02 00:21:24 +10:30
c3f4808cd2
code was calling now-removed emote
2012-01-01 01:13:40 -05:00
5830f0f32a
Added a L2 radiation suit closet to match the biosuit and eod suit closet types.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2890 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-01 01:28:21 +00:00
a99a19b9eb
Changed all chances of sleep curing diseases to laying down. Temporary, or perhaps permanent, fix because sleeping is broken.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2889 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-01 00:29:34 +00:00
51c6712f26
Feedback will now log jobban jobs. It's anonymous tho, only jobs are logged.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2888 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-01 00:07:12 +00:00
22719c3258
Mecha no longer crush their occupants if you switch to internal pressure. (Normally.)
...
Bugfix: Not all suits now protect from air pressure.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2887 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-31 23:24:14 +00:00
cfba741fa2
Added two new variables, "canstun" and "canweaken". They can be modified in runtime to prevent mobs from ever being weakened and stunned by tasers/batons/electrified doors.
...
Xenos are immune to stunning and weakening. This basically means you cannot run up to a xeno and shoot them with a taser and game over. This makes them a lot more dangerous. To compensate, I've added in a xeno-exclusive variable controlling movement delay addition. When a xeno is stunned, its movement speed goes down. The speed is recovered in the life() proc.
Modifications to critter.dmi (manhacks). Added a new lighting icon, floor lights. Possible implementation later.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2886 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-31 22:50:38 +00:00
1f2f0a68dd
Merge pull request #184 from Tastyfish/master
...
fixed typo in piano
2011-12-31 14:28:57 -08:00
5628272bde
fixed typo in piano
2011-12-31 17:28:19 -05:00
5df72b9d70
Merge pull request #183 from Tastyfish/master
...
somehow this bug was only an issue once in a real game, fixed
2011-12-31 13:59:36 -08:00
522f745e71
somehow this bug was only an issue once in a real game, fixed
2011-12-31 16:56:55 -05:00
Tastyfish