Commit Graph

9733 Commits

Author SHA1 Message Date
Spamcat
40067b3d95 Fixed #2598
also fixed a derp in CE's office
2013-03-31 16:54:53 +04:00
Spamcat
020a555f0f Fixed #2596.
also fixed #2599 in my map commit
adding these so issues would automagically close when merged because no-one closes them ever
2013-03-31 15:19:09 +04:00
Spamcat
dc2c87bc46 Fixed #2607
and #2600 - in previous commit
2013-03-31 14:26:44 +04:00
Cael_Aislinn
14bbdc91ca cleaned up artifact/find debris spawning, stopped debris being dropped for every asteroid turf, dropped machinery heat gain by 3/4
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-31 01:29:19 +10:00
Chinsky
fabb43d38a Merge pull request #2595 from Spamcat/BEF-staging
BEF staging
2013-03-29 06:18:51 -07:00
Spamcat
e424850568 Revert "Removed unneeded checks."
This reverts commit 53b0a3f8c3.
*slaps himself* Don't touch what's working, chucklefuck.
2013-03-29 14:51:57 +04:00
Spamcat
53b0a3f8c3 Removed unneeded checks.
config.usealienwhitelist check is already in the function
2013-03-29 14:33:32 +04:00
Spamcat
6f1b9a44ab Virology is working again. 2013-03-28 18:23:30 +04:00
Asanadas
f3d605abe3 De-Culting and you! Null Rods re-receive the ability to de-cult cultists, and a tiny desc change. Holy Water also has the chance to de-cult on metabolism, but less of a chance than the null rod. Holy Water may need some balance adjustments, will watch it in the future.
Signed-off-by: Asanadas <asanadas@hotmail.com>
2013-03-27 19:45:40 -04:00
Spamcat
288f0926fe Made monkeys infectable, 2013-03-27 22:36:24 +04:00
Spamcat
7bd9bf57c0 Nerfed syringestab.
Again.
2013-03-26 13:26:59 +04:00
Spamcat
71031c2470 Chemmaster puts pills in pill bottles. 2013-03-26 13:24:35 +04:00
Spamcat
4ad2ce87a6 bleh, removed stray debug thingy 2013-03-24 14:40:15 +04:00
Spamcat
285a1dd89e Arrivals announcement computer strikes back!
phew, took me long to get rid of it
2013-03-24 02:20:57 +04:00
Spamcat
fcac941bc1 Fixed lizards being unable to spawn mid-round.
more dirty fixes, yay
2013-03-23 03:02:45 +04:00
Christian Bielert
599e410d53 Merge pull request #2579 from Uristqwerty/tube-update
Update from early tubes with bugs...
2013-03-21 09:05:58 -07:00
Spamcat
5fefbb3e29 The the commit message. 2013-03-21 18:11:26 +04:00
Spamcat
593ded7983 Spiderbot quickfix. 2013-03-21 18:00:18 +04:00
Spamcat
3270b9cadf Spiderbots drop held items when destroyed and show them when examined. 2013-03-21 16:01:09 +04:00
Asanadas
0a21e8a4f4 Whoops spelled internal affairs wrong. This pretty much overwrites the lawyer job with an Internal Affairs Agent, made to Cajoes guidelines to the best of my ability. New suit, messed up PDA, and loyalty implanted / answering to the captain to maybe they'll have more pull on the server.
Signed-off-by: Asanadas <asanadas@hotmail.com>
2013-03-21 02:59:29 -04:00
Uristqwerty
6a66f542d9 Update from early tubes with bugs, to tubes with less bugs and more features based on feedback. 2013-03-20 18:49:14 -04:00
Spamcat
47606f0142 Whoops...
fixed the fix
2013-03-20 18:58:01 +04:00
Spamcat
3b0c07d232 Removed unneeded message when feeding people.
hacky-hacky
2013-03-20 13:17:55 +04:00
Spamcat
d4275b5ab4 Made syringe guns reject broken syringes. 2013-03-20 12:43:29 +04:00
Spamcat
86cc28dd57 Fixed posibrain installed into spiderbot bug, made posibrains a child class of MMI. 2013-03-19 14:37:21 +04:00
Spamcat
76720abd6f Merge branch 'BEF-staging' of github.com:Baystation12/Baystation12 into BEF-staging 2013-03-19 11:17:32 +04:00
Christian Bielert
21de1ca08a Merge pull request #2564 from Spamcat/bleeding-edge-freeze
BEF fixes
2013-03-18 11:42:56 -07:00
Spamcat
1758bf8314 Fixed spiderbots grabbing items out of reach. 2013-03-18 19:54:03 +04:00
Christian Bielert
48e1a7dfdc Merge pull request #2563 from Baystation12/bleeding-edge-freeze
All commits in BEF are just fixes
2013-03-18 08:47:08 -07:00
Christian Bielert
05f4aba49f Merge pull request #2560 from nan0desu/for-upstream
Fix runtime while electrocuting slimes
2013-03-18 08:44:41 -07:00
Spamcat
4036ee3732 Fixed dem closets. 2013-03-18 18:37:57 +04:00
Spamcat
e417ad2ec7 Fixed ghosts hearing whispers. 2013-03-18 18:03:53 +04:00
Spamcat
5e2c921933 Fixed nanopaste messages.
(and some my shitcode)
2013-03-18 18:01:51 +04:00
Nanodesu
83cc8a2b6c Fix typos in brain surgery 2013-03-18 13:32:13 +04:00
Nanodesu
e93e0cb0df Fix runtime while electrocuting slime 2013-03-18 13:17:45 +04:00
Cael_Aislinn
cad490c5f1 hand pick can fit into the excavation kit, made the xenoarch tool closet properly retain icon states
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-18 18:51:21 +10:00
Chinsky
729e187ae6 Merge pull request #2546 from caelaislinn/bleeding-edge-freeze
Tweaks and such
2013-03-18 00:15:47 -07:00
Cael_Aislinn
398bdafbbd runtime fixes
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-18 12:01:43 +10:00
Cael_Aislinn
00c915b16a fixed size of 5/6 picks, fixed some of the field types for suspension gens
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-18 11:53:55 +10:00
Cael_Aislinn
e2058e57a4 added a new manual explaining suspension, tweaked a manual
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-18 11:52:07 +10:00
Cael_Aislinn
dc017d6cce Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-18 01:08:45 +10:00
cib
7fbc86da5a Vendors now charge money.
Swipe your ID card and enter PIN to pay.
2013-03-17 15:56:43 +01:00
Chinsky
d58ef35b6f Made vote play alarm sound when started. 2013-03-17 04:41:42 +04:00
Chinsky
bc69115b8f Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-16 21:13:49 +04:00
Chinsky
76ecf647d7 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-16 21:06:57 +04:00
cib
57955dbf6a Fixed toxloss messages.
Also added anti-spam checks to custom_pain
2013-03-16 15:48:50 +01:00
Christian Bielert
14a96f77ab Merge pull request #2539 from comma/organ
Organ code restructuring
2013-03-16 07:10:40 -07:00
Chinsky
b5e7f7d204 Running around with fractures would damage internal organs inside of fractured areas. 2013-03-16 15:47:46 +04:00
Cael_Aislinn
42d8cd33e0 made fuel injectors and core gens properly start in mobile configs, made large crates able to hold 1 large item (machinery or structure)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-16 20:58:31 +10:00
Cael_Aislinn
38d30122e2 re-add holy water reagent
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-16 20:38:01 +10:00