cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,034 Commits 8 Branches 0 Tags
f36ebe3b9d02dbc21856e66f8f3206dd3c1d9893
Commit Graph

9204 Commits

Author SHA1 Message Date
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
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
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
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
Christian Bielert
10c3beae24 Merge pull request #2514 from comma/master 
Goatee fix.
 2013-03-10 05:01:50 -07:00
Chinsky
cf423fe979 Fixed Goatee and Male Skrell Tentacles. 2013-03-10 15:37:33 +04:00
Chinsky
c45a81789a Merge pull request #2507 from caelaislinn/bleeding-edge-freeze 
Beekeeping
 2013-03-09 05:54:28 -08:00
Cael_Aislinn
06476113fa add the beekeeping manual to hydroponics, add a beenet to the hydro lockers 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-09 23:48:31 +10:00
Chinsky
cce3e8e4e9 Merge pull request #2503 from CIB/feature 
Improved brainloss effects.
 2013-03-09 05:48:19 -08:00
Cael_Aislinn
56a7441ef5 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-09 23:46:09 +10:00
Cael_Aislinn
17e607b0d8 compile fix 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-09 23:45:27 +10:00
Cael_Aislinn
7de4093060 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-09 23:41:53 +10:00
Cael_Aislinn
86a58380b3 added bees supply pack to cargo bay, made vending machine produce beezeez, make apiaries constructable out of wood 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-09 23:39:24 +10:00
Cael_Aislinn
b13c634293 added bee stuff, will post documentation for it on the forums. features include: place an apiary on a hydro tray to cultivate bees, bees auto breed and spread (if they have enough food), bees give slight accumulative boosts to nearby plants, bee hives produce honey and honeycomb added manual to explain beekeeping, rampaging bees can do a lot of damage but anything with bio protection will reduce likelihood of being stung 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-09 23:38:54 +10:00
cib
db707b4e5b Headrevs now get the names of 3 people who might be convertible. 2013-03-09 14:29:48 +01:00
cib
bd71f2e25c Fixed advanced med scanner not showing blood % 2013-03-09 11:02:01 +01:00
Spamcat
a32639bef4 Returned captain's PDA. 
Fixes #2466.
 2013-03-09 13:59:08 +04:00
Spamcat
c290745128 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-09 13:51:37 +04:00
Spamcat
39d01d4310 Nerfed syringestab, made it produce a broken syringe with fingerprints and stuff, so tater will need to thing about evidence disposal. 2013-03-09 13:51:05 +04:00
cib
55936a3e96 Forgot to save airlock.dm before committing. 2013-03-09 10:40:32 +01:00
cib
58186ce7e0 Improved brainloss effects. 
- Will drop items/fall down with a lot of brainloss now, headache and blurry vision with small brainloss.
- Removed stupid effects, like random messages and headbutting airlocks.
- Cloning now will leave you at lower health and cause small amounts of brainloss.
 2013-03-09 10:35:20 +01:00
Christian Bielert
c31abc3b05 Merge pull request #2502 from comma/gunmode 
Aiming Mode
 2013-03-09 00:13:19 -08:00
baloh.matevz@gmail.com
960cd335e6 - Minor bugfix for job feedback gathering. YOUNG did not match the protocol. 
git-svn-id: https://tgstation13.googlecode.com/svn/trunk@5603 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-03-09 07:43:45 +04:00
ericgfwong@hotmail.com
6ac93ddd4d Added new descriptions to each of the rigs and gave them unique armor values. 
Medical PDAs should now have a green stripe

Fixed a misplaced /area/ issue in the Warden's office

git-svn-id: https://tgstation13.googlecode.com/svn/trunk@5602 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-03-09 07:43:04 +04:00