Commit Graph

10123 Commits

Author SHA1 Message Date
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
Chinsky
97b126b8ab Merge pull request #2516 from caelaislinn/xenoarch
Xenoarchaeology Update
2013-03-16 03:10:16 -07:00
cib
d1572585d8 Removed crew transfer from comms console.
Crew transfer is meant to be OOC, not IC.
2013-03-15 15:53:46 +01:00
cib
ae53c1e2d4 Shuttle doors now lock on transit. 2013-03-15 15:50:55 +01:00
Chinsky
8ec33904dc Moved ruptured lung effects into lung processing 2013-03-15 18:28:44 +04:00
Cael_Aislinn
435ceda41f Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-15 20:37:35 +10:00
Cael_Aislinn
74d0608278 made research shuttle consoles buildable, removed a debug thing for analysis machines
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-15 20:06:22 +10:00
Cael_Aislinn
1b0c83cb76 renamed a bunch of areas, naming tweaks elsewhere, added some custom mapplaced obj definitions
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-15 20:05:27 +10:00
cib
cbc019d279 No more burning your hands off on 200C lightbulbs. 2013-03-15 00:53:50 +01:00
Chinsky
bf68f83546 Fixed brain surgery datum having duplicate class name.
Made brain surgery into two steps, hemostat-fixovein.
2013-03-15 00:32:27 +04:00
RavingManiac
585fed0005 Intercom canhear_range reverted to 2.
Intercom in interrogation observation room shifted to cover the whole room.
2013-03-15 02:19:58 +08:00