Commit Graph

14295 Commits

Author SHA1 Message Date
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
paprka 1cdd5f011f blood for the blood god 2015-01-20 19:17:59 -08:00
Jordie0608 d2cd579a4a Additional fix i missed 2015-01-21 14:03:17 +11:00
Jordie0608 4f927ad5cb Fixes 2015-01-21 14:01:37 +11: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
Pennwick 6acc082cf3 Fixes addiction bug
Adds in a line to increment addictions in stage4. 

Other stages were triggering twice when values were exactly 10, 20, or 30. Edited the if statements to remove overlap. Now 0 and lower is no effects, 1-10 is minor and so on up until 41 where the addiction is removed.
2015-01-20 16:37:46 -06:00
paprka 25a54a7466 adds walterje's pais 2015-01-20 14:31:17 -08:00
Delimusca 83bf6e6c56 reworked ranged mimics, fixed most bugs 2015-01-20 13:31:21 -07:00
Swag McYolosteinen ad6a4a6722 Fixes reversed photocopier wrenching messages & phasing through walls. 2015-01-20 18:06:50 +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
Steelpoint ad04ce62a0 AllAccess+EasierSuitIdentification 2015-01-20 20:53:13 +08:00
Iamgoofball dda869f586 Allows Space Cleaner to clean off Colorful Reagent effects 2015-01-19 20:16:00 -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
phil235 1401c8043b Fixes cargotech jumpsuit onmob sprite (revert the sprite to the old grey+lightbrown one)
Fixes a couple jumpsuit not having the wrong or no inhand sprite.
2015-01-19 21:14:43 +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
carnie 10906be41a Improves shuttle corner fix to use actual appearance data of the turf, so it takes transform into consideration. 2015-01-19 18:48:52 +00:00
Delimusca 07927e759d added ranged mimic 2015-01-19 11:44:34 -07: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
Deantwo 0e150ced74 Paper Input Box Fix
- Created a copy of stripped_input called stripped_multiline_input that
does the same, expect it is a multiline input.
- Makes the writing input box multi-line again.
- Renaming paper now uses the stripped_input.
- Fixes https://github.com/tgstation/-tg-station/issues/7132
2015-01-19 17:13:08 +01:00
paprka 2566cf030e fixes ebow and KA breaking once emp'd 2015-01-19 01:28:14 -08:00
Jordie0608 3d2da1b350 Fixed runtiming commas 2015-01-19 20:15:01 +11:00
paprka 65024847ac refactors clothing 2015-01-19 00:59:35 -08:00
Jordie0608 3bd637b186 Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew()
Conflicts:
	code/modules/reagents/reagent_containers/bottle.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	code/modules/reagents/reagent_containers/patch.dm
	code/modules/reagents/reagent_containers/pill.dm
2015-01-19 18:28:38 +11:00
paprka f58096575c refactors guns 2015-01-18 23:28:24 -08:00
Jordie0608 a643ecdfcc Food and drinks refactor 2015-01-19 18:06:15 +11: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 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
Firecage 64b8bf913c This changes the robotics transformation nanites ID to nanomachines 2015-01-19 04:04:25 +02:00
Menshin b8230e024b * Cleaned the disposals code a bit (making it uses the defines !)
* Disposals constructs are now stored inside disposals instead of having them deleted and a copy created
* Bins, chutes and outlets will now properly clean any connected trunk on qdel()
* You can no longer change the RPD setting by keeping its window opened
* You can no longer use the RPD as a non-dextrous mob
* Reinforced floors will now be broken by ejected items/mobs, instead of stucking them in the void indefinitely
2015-01-19 01:53:19 +01:00
carnie f4c35d2a78 Resolves #6971 - non-lighting_subarea areas are now stored in list/sortedAreas. This list is sorted by area name using timSort only when areas are added to it. Currently the only other thing that adds to this list is the station-blueprints object.
This allows you to jump to areas by name, rather than type.
2015-01-18 20:46:30 +00:00
Steelpoint a097f86ac6 ERTBalancePassV1 2015-01-18 19:18:47 +08: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
Jordie0608 ee25f2e069 Prevents permabans from noting as 0 minute bans 2015-01-18 16:15:29 +11:00
paprka a2fe7f0352 bloat killer 9000 2015-01-17 16:36:27 -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
GunHog 8212923b49 Removes tracking of lockdown status, fixes counter
A cyborg's lockdown status has been removed from the tracker.
Cyborgs are now properly removed from the AIs borg list if they are
destroyed.
2015-01-17 12:46:19 -06:00
Swag McYolosteinen 52b6ff873f Fixes photocopiers trying to divide people by five. 2015-01-17 19:03:41 +01:00