Commit Graph

9862 Commits

Author SHA1 Message Date
Cael_Aislinn
7f4e52e299 replaced carrier reagents with existing chemical reagents
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-19 02:31:50 +10:00
Cael_Aislinn
ecb02a3acd reduced output message frequency for artifacts and analysis machinery, tweaked tools + finds, added storage item for excav picks
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-19 02:30:43 +10:00
Cael_Aislinn
040cf2f8d5 tweaked artifact extraction, artifacts
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-19 02:27:46 +10:00
Cael_Aislinn
31bf502e65 moved a file, add/tweaked some sprites
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-19 01:58:42 +10:00
Chinsky
334da25223 Added surgery to put things in people. 2013-02-18 13:22:23 +04:00
Gamerofthegame
437cca538b Merge branch 'bleeding-edge-freeze' of https://github.com/Gamerofthegame/Baystation12 into bleeding-edge-freeze 2013-02-18 00:07:40 -05:00
Cael_Aislinn
24763f8bb0 removed debug output, cleanup of alien languages, bumped tajaran darkseeing
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-18 13:07:01 +10:00
Cael_Aislinn
2b4827692c tweakfixes to admin PMs
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-18 13:06:07 +10:00
Cael_Aislinn
6918fb0ef9 new crew manifest for id computers, tweaks to manifest to better fit window, renamed roboticist alt title post-feedback
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-18 12:56:57 +10:00
Jamini
15fcdafe8e Third time is a charm. Fixed a bunch of map things and reverted the axe back to it's premerge values. Also added airlocks back to mining.
Signed-off-by: Jamini <mobiousjami@gmail.com>
2013-02-17 20:59:36 -05:00
Gamerofthegame
64c72ef969 Adds the ERT to the debug command for adminnery. Not exactly like the pre-merge one, as that was based off something else so I couldn't copy-paste. It should give admins a easier time of making things up, though, and so long as future plans go into effect a admin ought to be able to do it on the fly in less then a minute. 2013-02-17 18:15:07 -05:00
Chinsky
4a1198bfe4 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-02-18 00:11:51 +04:00
Chinsky
baec30f690 Moved procs around, added comments. 2013-02-17 22:06:26 +04:00
Chinsky
24351fbea8 Made all proc declarations full, updated indentation accordingly.
Changed paths for wounds.
2013-02-17 20:31:55 +04:00
Chinsky
ab9ed98f07 Removed all cases for monkeys, since they do not have organs anymore.
Moved dropped limb icon generation code to it's New()
2013-02-17 19:38:28 +04:00
Cael_Aislinn
fea6635060 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	code/game/verbs/who.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-18 01:25:47 +10:00
Chinsky
92c8c34c2a Removed getDisplayNameProc(), since all organs have display_name var anyway.
Moved some severed head code into it's New() for readability.

Fixed noexplode flag in droplimb still making limb give explosion message.
2013-02-17 19:12:00 +04:00
Cael_Aislinn
c4176beb3e some more useability tweaks to adminwho/modwho
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-18 00:56:53 +10:00
Cael_Aislinn
da9b87a288 beepsky now fights hostile NPC mobs, and vice versa
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-18 00:32:49 +10:00
Chinsky
0b8bae86ae Only bandaging bleeding wounds would cause itching. Bruise packs give out different message during treatment depending on type and severity of wound. 2013-02-17 18:31:14 +04:00
Chinsky
948e859d80 Fixes #2343 (and #2342), #2356 Readded pre-merge bottle and pill icon choosing system. 2013-02-17 18:31:03 +04:00
Chinsky
5c13beaf59 Fixed issue #2341 2013-02-17 17:57:23 +04:00
Chinsky
0cb4e29a4a Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-02-17 17:51:09 +04:00
Chinsky
a68e5d3875 Merge pull request #2333 from Baystation12/BEF-staging
Merge on the 16th if no issues
2013-02-17 04:44:25 -08:00
Cael_Aislinn
4b69afd15b made carp migration actually end (carp disappear back into the void)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-17 11:17:45 +10:00
Cael_Aislinn
cabc70398b added some info text to adminwho/modwho
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-17 11:12:17 +10:00
Chinsky
226a96b38f If bullet misses someone it does not disappear, but continues on its way. 2013-02-16 21:02:38 +04:00
Chinsky
9c43050ba7 Change to check_zone proc.
It makes possible to target hands/feet/groin.
Not sure what side effects would this change have.
2013-02-16 19:01:48 +04:00
Chinsky
106018ca3b Fix for firing distance calculation.
'original' var is not a starting point of projectile, but an atom it was fired at initially.
'starting' is turf where projectile was fired from.
2013-02-16 19:00:49 +04:00
Chinsky
764fa03a17 Fix for negative miss chance modificators working. 2013-02-16 18:58:43 +04:00
Chinsky
bfe9b3839e Merge branch 'gun' of https://github.com/comma/Baystation12 into gun 2013-02-16 18:53:20 +04:00
Chinsky
7a94494eee Merge pull request #2354 from Zuhayr/master
Posibrain fixes (double name, protolathe, double binary)
2013-02-16 02:22:47 -08:00
Zuhayr
4dd7141e32 Removing a debug string. 2013-02-16 16:19:39 -08:00
Zuhayr
6ad09d49c8 Fixes for posibrain name generation, research design for protolathe, possible for for double-say for posibrains (cannot test locally). 2013-02-16 14:21:00 -08:00
cib
eaa8130672 Balance fixes to medical side-effects.
- Bandage/ointment now causes itch instead of cramps
- Reduced amount of messages/effects by side-effects to 1/3
- Side-effects will now disappear after a while if left untreated, but they will cause damage before that.
2013-02-15 14:25:11 +01:00
Gamerofthegame
713176a466 Changes Secret-Nuke ready requirements from 15 to 25. 2013-02-14 22:50:01 -05:00
cib
afccc33ddb Forgot to give MD virology access. 2013-02-14 23:13:18 +01:00
Chinsky
8b8556a1b1 Removed requirements for face surgery to cut open head too, real counterintuitive and looks like copypaste error >.> 2013-02-15 02:06:35 +04:00
Asanadas
5b14c1f13f Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-14 13:11:36 -05:00
cib
1c341af3e9 Merge branch 'feature' of github.com:CIB/Baystation12 into feature 2013-02-14 16:30:29 +01:00
cib
484c936c6d Fixed a bug with intercept reports. 2013-02-14 16:29:07 +01:00
cib
644e309594 Virologist is an alt title again. 2013-02-14 15:36:06 +01:00
cib
c5301c5144 Fixes issue #2296: Humans will not react to sleep toxins in smaller amounts than can be scrubbed. 2013-02-14 15:06:10 +01:00
cib
5217227f9a Fixes issue #2309: Infected blood now infects again. 2013-02-14 14:45:52 +01:00
Cael_Aislinn
ff222c2f13 fixed biomass/spacevine spawning, tweaked event probabilities, made aliens default to disabled as a random event
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-14 23:17:54 +10:00
Cael_Aislinn
d1e6e342c5 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-14 22:10:02 +10:00
cib
5b6fd2de48 Merge branch 'master' of github.com:Baystation12/Baystation12 into BEF 2013-02-14 13:05:37 +01:00
cib
4c49e51182 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into BEF 2013-02-14 13:05:27 +01:00
Cael_Aislinn
49e4eaeffb Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-14 22:02:06 +10:00
Cael_Aislinn
f0de14d0d4 fixed xenoarch chemical analysis, added icons for excavation picks, various misc tweaks
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-14 21:59:50 +10:00