Cheridan
fbb0c67ebb
Merge pull request #7189 from pudl/nanomed
...
nanomed update
2015-01-20 23:29:36 -06:00
Cheridan
d527b99fd7
Merge pull request #7202 from Iamgoofball/goonetics
...
Robots now speak in a different font.
2015-01-20 23:18:11 -06:00
pudl
e78e3e5118
adds reserve tanks of the 4 basic chems, brute medkits, and brute medbots.
2015-01-20 23:16:21 -06:00
Cheridan
93f0514017
Merge pull request #7199 from sawu-tg/expruntime
...
Fixes a runtime
2015-01-20 23:06:11 -06:00
pudl
dd5c7db5ad
in order to help doctors keep up, since they now need a lot more to heal people, the nanomeds have been stocked with a lot of extra stuff.
...
12x syringe
10x styptic patch
10x silver sulf patch
4x charcoal bottle
4x epinephrine bottle
4x morphine bottle
4x diphen bottle
3x potassium iodide bottle
5x salglu bottle
3x atropine bottle
6x spaceacillin syringe
10x calomel syringe
10x salbu pill
10x mannitol pill
5x mutadone pill
4x health analyzer
2x crew monitor
CONTRABAND:
all of the same except with 3 bottles of toxin
the two types of wallmed have been combined into one wallmed, which contains all of the above except halved. in instances where the number was odd, the higher of the two numbers was taken.
medical closet has been stocked with a lot of new stuff.
2x beakers
2x droppers
1x medical belt
1x syringe box
1x toxin bottle
2x morphine bottles
3x epi bottles
3x charcoal bottles
1x rxglasses box
this, of course, 3 new pills and 3 new bottles in code so they could be in the nanomed.
gives genetics a bottle of mutadone pills on box and eff3 and puts a public bottle of epinephrine on the medbay desk. adds a single syringe to boxstation's medical storage.
medkits now have some new equipment.
normal
2x styptic patch
2x sulf patch
1x salicyclic pill
1x health analyzer
fire
4x silver sulf patches
1x health analyzer
1x epipen
1x salicyclic pill
toxin is unchanged
oxygen
4x salbu pills
2x epipen
1x health analyzer
all maps and z levels are updated for this.
renames styptic patch to brute patch and silver sulf patch to burn patch. renames charcoal bottle to antitoxin bottle
adds myself to admins.txt
2015-01-20 22:26:13 -06:00
Cheridan
793243763d
Merge pull request #7185 from paprka/inhandrefactor
...
Inhand refactor
2015-01-20 22:16:06 -06:00
Cheridan
29af018796
Some fixes
...
-Fixes magic wands having electronic firing pins, now have FANCY CRYSTAL SHARDS
-Fixes grammer issue.
-Fixes code not compiling due to outdated proc
2015-01-20 21:41:36 -06:00
Cheridan
8f98597490
Merge pull request #7049 from RemieRichards/PipesAndBuckles
...
Buckling Refactor + HE Pipe heat based colour
2015-01-20 20:07:18 -06:00
tkdrg
e4891e37d5
Merge pull request #7227 from Alek2ander/howdidyouexpectthistowork
...
Fixes genetics
2015-01-20 21:05:44 -03:00
tkdrg
d97e01e0db
Merge pull request #7120 from Menshin/clusterbangs_fix
...
Made clusterbangs functionals
2015-01-20 21:00:52 -03:00
tkdrg
7de9a6e1ca
Merge pull request #6990 from Incoming5643/only_you_can_prevent_horrific_floating_brains
...
Magic Mania 1.83: Attack of the Flying Invisible Magic Brains!
2015-01-20 20:20:07 -03:00
phil235
f4ed29551b
Merge pull request #7204 from Deantwo/NoCommentPDA
...
Blank PDA Messages Fix
2015-01-20 21:21:18 +01:00
Alek2ander
6eee450855
Fixes genetics
2015-01-20 23:01:35 +03:00
Swag McYolosteinen
e979bc95b1
Merge pull request #7150 from paprka/shoulderholster
...
Adds shoulder holster for the detective
2015-01-20 17:59:25 +01:00
Swag McYolosteinen
48d032bd88
Merge pull request #7146 from paprka/wcoatr
...
Tones down winter coat spawning, removes santa hat spawns
2015-01-20 17:57:24 +01:00
Swag McYolosteinen
63cb7dad4a
Merge pull request #7145 from paprka/gunsicons
...
splits gun.dmi up into multiple files
2015-01-20 17:56:41 +01:00
Ergovisavi
f7216ed535
Merge pull request #7161 from Firecage/Simple_animal_suiciding
...
This adds the ability for simple animals to commit suicide.
2015-01-19 18:50:37 -08:00
tkdrg
a9160e52dc
Merge pull request #7105 from Carn/#6993
...
Resolves #6993 - Moved pai controller into a subsystem.
2015-01-19 20:17:14 -03:00
Deantwo
2a78daa8b5
Blank PDA Messages Fix
...
- Added "if (!t) return" after msg_input is called. So no blank
messages.
2015-01-19 20:10:21 +01:00
Iamgoofball
22ff5dc362
changes the font type and adds pAI support
2015-01-19 11:02:46 -08:00
Iamgoofball
05c4bd042f
Robots now speak in a different font.
2015-01-19 10:50:34 -08:00
Remie Richards
96ac837b65
Merge pull request #6960 from Iamgoofball/goonetics
...
Added 2 new powers and 9 new disabilities from goon and /vg/!
2015-01-19 17:47:33 +00:00
Sawu
5f185bf74b
Fixes a runtime
...
Fixes the experimentor throwing runtimes from mismatched types.
2015-01-20 04:27:42 +11:00
hornygranny
1647bbd603
Merge pull request #7139 from Menshin/clientless_vision_runtime_fix
...
Fixes runtime related to handle_vision for clientless mobs
2015-01-19 09:01:10 -08:00
paprka
65024847ac
refactors clothing
2015-01-19 00:59:35 -08:00
paprka
f58096575c
refactors guns
2015-01-18 23:28:24 -08:00
Iamgoofball
612e78e1ec
whoops, broke some proc names
2015-01-18 22:57:41 -08:00
tkdrg
98ecd7ffdc
Merge pull request #7131 from Iamgoofball/goonchem_shoehorn_backup
...
Goon Chemistry: Addiction and Overdosing
2015-01-19 03:32:57 -03:00
Iamgoofball
80b5dce212
whoops
2015-01-18 22:19:21 -08:00
Iamgoofball
b83ca5f8d1
Goon Chemistry: Addiction and Overdosing
2015-01-18 21:50:54 -08:00
paprka
2706be1190
optimizations to the way inhand files are found
2015-01-18 21:14:47 -08:00
paprka
88230fabfa
inhand refactor
2015-01-18 20:58:31 -08:00
Cheridan
c226a7aa2e
Merge pull request #7053 from Chocobro/interceptreportimprovement
...
updates intercept report w/ formatting, spellcheck
2015-01-18 22:14:26 -06:00
Cheridan
cc0a9a674e
Merge pull request #7147 from paprka/clothescleanup
...
Removes a ton of bloat from several clothing files and inhands
2015-01-18 20:26:36 -06:00
Orange Borg
893c876261
Add the message argument to can_speak
...
It is needed for *raisans*
2015-01-19 10:25:51 +13:00
Swag McYolosteinen
6798919be6
Merge pull request #7137 from tkdrg/heatertweak
...
Fixes heaters breaking chem dispenser research
2015-01-18 11:23:07 +01:00
Firecage
c866cd5189
This adds the ability for simple animals to commit suicide. ;)
2015-01-18 10:52:27 +02:00
Cheridan
2f66068231
Merge pull request #7101 from Carn/timsort_fix
...
Fixes timSort
2015-01-17 23:19:19 -06:00
Iamgoofball
b64efc6b54
Adds 3 new disabilities
2015-01-17 18:55:41 -08:00
paprka
f797b04e15
adds shoulder holster for the detective
2015-01-17 17:11:38 -08:00
paprka
a2fe7f0352
bloat killer 9000
2015-01-17 16:36:27 -08:00
paprka
ae21c54774
rip reindeer horns
2015-01-17 15:43:39 -08:00
paprka
b83e6d9da4
winter coat removals
2015-01-17 15:39:50 -08:00
paprka
1b6831dab1
splits gun.dmi up into multiple files
2015-01-17 15:34:30 -08:00
Cheridan
bd8594dd20
Merge pull request #7116 from bear1ake/protolathe-fix
...
Adds "Firing pins" category to protolathe
2015-01-17 15:59:28 -06:00
tkdrg
059d8cf650
Merge pull request #7098 from Menshin/disposal_constructs_stacking_prevention
...
Some disposals cleaning/stacking fix
2015-01-17 17:16:52 -03:00
Menshin
07d38a6515
Fixes runtime related to handle_vision for clientless mobs
2015-01-17 21:02:29 +01:00
tkdrg
3c2f10e401
Fixes heaters breaking chem dispenser research
2015-01-17 16:34:00 -03:00
phil235
8a61d11e2e
Merge pull request #7069 from Firecage/table_deconstruction_fix
...
Fixes amount of materials gotten from deconstructing tables
2015-01-17 19:57:49 +01:00
Iamgoofball
b031c23a9e
woop woop warning fix woop woop
2015-01-16 21:09:07 -08:00
