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
Chinsky
38a8246994
Moved code for injecting and taking blood to separate procs.
...
Removed special case for blood from regent transferring proc.
Fixed humans spawning as limbles torsos.
2013-03-14 20:18:37 +04:00
Cael_Aislinn
d8fbd0b2cc
tweaked some names
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-03-15 01:09:02 +10:00
Cael_Aislinn
3c745a1ee2
added some storage boxes + gearbelt
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-03-15 01:03:01 +10:00
Cael_Aislinn
bf216021fc
added/cleaned up research outpost areas (inc iconstates), moved area definitions to separate file
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-03-15 01:02:23 +10:00
Christian Bielert
cd3cc0a362
Merge pull request #2531 from Jamini/bleeding-edge-freeze
...
Minor changes to access.
2013-03-14 07:00:44 -07:00
Chinsky
13b6b2f61b
Moved organ and blood code to module folder.
...
Moved most organ and blood procs to that folder.
Refactored handle_organs a little.
Added comments in some places.
2013-03-14 11:52:53 +04:00
Chinsky
28290d4852
Fixes issue with 0 toxloss giving people worst pain message.
2013-03-14 08:56:13 +04:00
Chinsky
f36ebe3b9d
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-03-14 05:07:14 +04:00
Chinsky
1486e4b487
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into HTML
2013-03-14 05:06:55 +04:00
Chinsky
f2f042c904
Merge branch 'surgery' into bleeding-edge-freeze
2013-03-14 05:06:02 +04:00
Chinsky
7ac3f65f1a
Merge branch 'nanopaste' into bleeding-edge-freeze
2013-03-14 05:05:43 +04:00
Chinsky
f8ae612991
Open incisions in surgery now bleed until closed or clamped.
2013-03-14 04:23:07 +04:00
Chinsky
4c7f1f21d9
Merge pull request #2525 from CIB/feature
...
Crew transfer votes now have a bias depending on how far into the round.
2013-03-13 16:35:16 -07:00
cib
bb0ed9a2ab
Toxloss now causes pain.
2013-03-13 17:04:02 +01:00
cib
3d1aa9c428
Moved the time from which crew transfer factor is > 1 up by an hour.
2013-03-13 10:58:28 +01:00
Chinsky
b906a22192
Syndicate? Whozzat?
2013-03-13 06:38:32 +04:00
Chinsky
468defbdfb
Made virus crate have virus2 again.
2013-03-13 06:15:56 +04:00
Chinsky
a2e2c373ef
Added new item - nanopaste.
...
Researchable by RnD (materials and engineering tech), used to repair robots and robolimbs more efficiently (twice as fast and both damage types at once).
2013-03-13 05:57:53 +04:00
Jamini
c03465882d
Unbolted upload, minor modifications to atmos to make it a little more effeciant and easy to use, returned CE access to the AI core, adjusted the manifest display so Roboticists do not show twice.
...
Signed-off-by: Jamini <mobiousjami@gmail.com >
2013-03-12 17:52:37 -04:00
Chinsky
8eea0abef4
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-03-12 08:48:40 +04:00
Chinsky
564e6b2f9b
Merge branch 'gun' into bleeding-edge-freeze
2013-03-12 08:46:07 +04:00
Chinsky
c351bc1a33
Getting hit by bullet will shake camera.
2013-03-12 08:43:42 +04:00
Chinsky
a4581cc1d8
Derp, accidentally deleted OD for chloral way back.
...
( c4997a34f1 )
Fixed now.
2013-03-12 08:40:47 +04:00
cib
0a37535d37
Crew transfer votes now have a bias depending on how far into the round.
...
Untested so far.
2013-03-12 02:17:53 +01:00
Chinsky
4f58416332
Merge pull request #2522 from RavingManiac/bleeding-edge-freeze
...
Intercom tweaked and notice boards added
2013-03-11 17:15:11 -07:00
Christian Bielert
817996cd09
Merge pull request #2519 from comma/bleeding-edge-freeze
...
Small things and SNEAKING IN TG COMMITS.
2013-03-11 15:54:24 -07:00
Chinsky
f13cca99e6
Added brain fixing surgery.
2013-03-12 02:22:46 +04:00
Chinsky
2d8b280d99
Reverted changes to RIG armor values
2013-03-12 01:46:34 +04:00
Chinsky
b1bb564168
Fixed issue with #2154
...
Also moved selection of base icon for limbs to update_mutantrace so it's only doen when race is changed.
Changed mob icons a little, to get rid of rogue red pixel on torso that was not covered by arm
Moved awkward red spot where missing hand would be to arm sprite, since missing whole arm would still make stump appear there, and it looks weird.
2013-03-12 00:41:37 +04:00
RavingManiac
2d49b05f93
Intercom hear range (that is, the distance at which it can be heard) changed from 2 tiles to 7 tiles, matching the viewing distance.
...
Notice boards added to research, security, engineering break room, medbay lobby, HoP's desk, bridge, cargo bay, cargo lobby and mining.
2013-03-12 03:45:55 +08:00
cib
d7714a2459
Fixed a bug with cloning taking meat.
2013-03-11 18:47:16 +01:00
cib
ecb08d0c46
Cloning now requires meat for biomass.
2013-03-11 18:20:02 +01:00
Chinsky
7e82d9064c
Head blows now can cause brain damage.
2013-03-11 04:59:24 +04:00
Chinsky
52ad4929d1
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-03-11 01:18:43 +04:00
Chinsky
b207349c44
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-03-11 01:18:10 +04:00
Chinsky
ced88e1569
Ported HUD functionality.
...
Sec HUDs showing brief of sec record.
Med HUDs changing status and showing brief of med record.
2013-03-11 01:11:56 +04:00
Chinsky
b9abe55aa8
Changed Escape objective a bit.
...
Wording now hints at 'fail if in shuttle brig' thing.
Also now needs to have traitor properly cuffed in that area.
2013-03-11 00:57:31 +04:00
Chinsky
b440f14ea6
Removed non-antag chars suicide verb.
2013-03-11 00:38:40 +04:00
Chinsky
611bd1c6e9
Removed ability to use radio while stunned again.
2013-03-11 00:38:16 +04:00
Chinsky
e60bef91bd
Added indication for when someone speaks into radio.
2013-03-11 00:27:18 +04:00