Tastyfish
e16b1dec3f
Merge remote-tracking branch 'upstream/master'
2012-01-02 07:22:29 -05: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
Tastyfish
1feb16439e
can get out of straight jacket after 4 byond minutes now (better than infinity)
2012-01-02 04:54:19 -05: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
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
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
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
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
Miniature
205ad71ee6
Made atmos control show name of alarm, coloured active alarms in list, added to map
2012-01-02 03:18:06 +10:30
Miniature
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
Tastyfish
c3f4808cd2
code was calling now-removed emote
2012-01-01 01:13:40 -05:00
Tastyfish
1f2f0a68dd
Merge pull request #184 from Tastyfish/master
...
fixed typo in piano
2011-12-31 14:28:57 -08:00
Tastyfish
5628272bde
fixed typo in piano
2011-12-31 17:28:19 -05:00
Tastyfish
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
Tastyfish
522f745e71
somehow this bug was only an issue once in a real game, fixed
2011-12-31 16:56:55 -05:00
Albert Iordache
47ada174be
Merge pull request #182 from Tastyfish/master
...
Toggle-Deny-Shuttle, can build fire alarms, atmos alarms, status displays and light switches
2011-12-31 11:38:31 -08:00
Tastyfish
c02979c148
Toggle-Deny-Shuttle, can build fire alarms, atmos alarms, intercoms, status displays, and light switches
2011-12-31 12:28:26 -05:00
Albert Iordache
977b37abde
Fixed a runtime error.
2011-12-31 14:49:35 +02:00
Albert Iordache
18e6242dc8
Merge pull request #181 from Tastyfish/master
...
fixed derp on vote announcement for custom vote
2011-12-31 02:55:46 -08:00
Tastyfish
a561862ef0
and there too
2011-12-31 01:51:06 -05:00
Tastyfish
2f6fc64353
admins cna see who set custom event now.
2011-12-31 00:35:44 -05:00
Tastyfish
c654a3d8d8
fixed derp on vote announcement for custom vote
2011-12-30 23:41:06 -05:00
CIB
a16c53ce7a
Merge pull request #180 from SkyMarshal/master
...
Bugfix for alien removal surgery
2011-12-30 18:13:54 -08:00
cib
3a20da81aa
Merge branch 'master' of github.com:Baystation12/Baystation12
2011-12-31 02:14:28 -08:00
cib
efcd5c29a9
Fixed the hunger symptom which was still using BS12's system.
2011-12-31 02:13:02 -08:00
cib
f7be1250a3
Many improvements to vira.
...
Implemented an efficient system for infection. Made sneeze and cough increase infection chance. Increased the lifespan of spaceacillin in a host. Removed the drool symptom.
2011-12-30 21:07:52 -08:00
cib
df4419da1e
Changed the genetics manual.
2011-12-30 19:43:01 -08:00
SkyMarshal
1c54c8b20f
Bugfix for alien removal surgery
2011-12-30 19:03:29 -07:00
Albert Iordache
39b6dd57e0
Removed and commented out the last traces of goon auth. code
2011-12-30 23:28:14 +02:00
SkyMarshal
648199a82f
Remove clown/mime costume crate, after a HoP went and started derping around with it.
2011-12-30 11:00:02 -07:00
SkyMarshal
0fe2cdab96
Added multiple string search to security records, fixed some evidence bag bugginess, fixed problem with the stamp remover.
2011-12-30 09:15:04 -07:00
Albert Iordache
ea92743b36
Merge pull request #173 from CIB/master
...
Fix stupid bug with trauma/cryo
2011-12-29 13:12:49 -08:00
cib
d8ec1ae26b
Fixed traumatic shock breaking cryo.
2011-12-29 22:09:36 -08:00
cib
d4c3053372
Increased the chance of getting infected significantly, with the current system it's too low.
2011-12-29 16:50:20 -08:00
cib
b5f8c930f1
Revert SkyMarshal's last commits since they don't even compile, which means they weren't tested.
...
Revert "Alien removal surgery, new traitor item, other stuff."
This reverts commit cc3bc60963
2011-12-29 15:15:51 -08:00
SkyMarshal
e12469aed9
Quick fix, and a fix for whispering.
...
Signed-off-by: SkyMarshal
2011-12-29 10:23:00 -07:00
SkyMarshal
5ab20fdf55
Merge branch 'master' of git://github.com/Baystation12/Baystation12
...
Conflicts:
code/game/objects/items/weapons/papers_bins.dm
code/game/objects/items/weapons/uplinks.dm
2011-12-29 10:08:58 -07:00
SkyMarshal
9ad0bc5c89
Can compile, now.
2011-12-29 10:01:19 -07:00
Tastyfish
f3145486cc
Merge remote-tracking branch 'upstream/master'
2011-12-29 08:38:42 -05:00
Tastyfish
8745b6bd40
pAI chatbot pal for when ghost aren't pAI'ing;
...
borgs can't move when no charge;
fixed misplaced light in RD office
2011-12-29 08:38:40 -05:00
CIB
6fbe9cb7bf
Merge pull request #167 from SkyMarshal/master
...
*sigh* Check the description
2011-12-29 05:23:24 -08:00
CIB
b7349e7fa1
Merge pull request #166 from CIB/master
...
Improved on medical a little, adding traumatic shock
2011-12-29 05:21:52 -08:00
