Commit Graph

7606 Commits

Author SHA1 Message Date
paprka
d96c9c2fdd fixes borg lmg 2015-01-23 02:57:52 -08:00
tkdrg
7df272f3d6 Merge pull request #7128 from Jordie0608/timeforanewnew()
Reagent container spawning refactor
2015-01-23 02:38:42 -03:00
tkdrg
abc78fbba1 Merge pull request #7177 from Menshin/disposals_cleaning_part2
Disposals cleaning/fixing part 2
2015-01-23 02:26:30 -03:00
Jordie0608
468557c5b7 whoops 2015-01-23 14:19:01 +11:00
Jordie0608
26161659c5 Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew()
Conflicts:
	code/modules/reagents/reagent_containers/bottle.dm
2015-01-23 14:11:38 +11:00
hornygranny
f2f7ee616d Merge pull request #7235 from Pennwick/master
Fixes issue #7234 addiction bug
2015-01-22 17:06:57 -08:00
hornygranny
22e96d3377 Merge pull request #7277 from pudl/chemfix
replaces all instances of pacid with facid
2015-01-22 17:06:46 -08:00
tkdrg
cc11078fa7 Merge pull request #6892 from Lo6a4evskiy/Food_cart
Food cart
2015-01-22 17:19:50 -03:00
Swag McYolosteinen
b44956df86 Merge pull request #7191 from paprka/ebowfix
fixes ebow and KA breaking once emp'd
2015-01-22 18:04:08 +01:00
Lo6a4evskiy
2eeaec6168 Merge remote-tracking branch 'upstream/master' into Food_cart
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-01-22 12:55:01 +04:00
Lo6a4evskiy
9edb727615 Make reagent_container/New take a volume argument 2015-01-22 12:34:17 +04:00
Jordie0608
f535abcc06 Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew()
Conflicts:
	code/modules/food&drinks/food/snacks_burgers.dm
	code/modules/food&drinks/food/snacks_cake.dm
	code/modules/food&drinks/food/snacks_pastry.dm
	code/modules/reagents/reagent_containers/pill.dm
	code/modules/reagents/reagent_containers/syringes.dm
2015-01-22 15:15:17 +11:00
pudl
c6b488a7c0 fixes up stuff i missed 2015-01-21 20:28:26 -06:00
pudl
08f8bb3ce8 replaces all instances of pacid with facid 2015-01-21 20:17:23 -06:00
Nienhaus
3733c4ff48 Merge pull request #7230 from paprka/painigga
Adds walterje's pais
2015-01-21 19:51:19 -06:00
tkdrg
d6e4b95ee0 Merge pull request #7176 from Carn/#7167
Resolves #7167 - Redone shuttle corners on zlevel 2, yet again
2015-01-21 16:20:19 -03:00
tkdrg
a274303404 Merge pull request #7006 from Incoming5643/hot_wiz_on_wiz
Magic Mania 1.84 Antag hud system for wizards
2015-01-21 15:34:25 -03:00
pudl
87fbe41f94 temporarily adds charcoal to the itching powder formula 2015-01-21 11:58:34 -06:00
pudl
21211a591b -adds mannitol to braincake and brainburgers
-adds omnizine to warm donk pockets
2015-01-21 11:49:55 -06:00
Swag McYolosteinen
c1edbb3ffc Merge pull request #7238 from pudl/chemstuff2
goonchem fixes take 2
2015-01-21 17:27:04 +01:00
Swag McYolosteinen
507cbcabd4 Merge pull request #7123 from GunHog/AI_Loves_Her_Borgies
Adds Cyborg data to AI's status screen
2015-01-21 15:46:18 +01:00
Swag McYolosteinen
0576c2203e Merge pull request #7198 from Deantwo/PaperCut
Paper Input Box Fix
2015-01-21 15:44:03 +01:00
Deantwo
ec49b6d724 Paper Name Limit
- Added arguments to the stripped_input call.
-- usr, no idea why it worked without this.
-- MAX_NAME_LEN, so you can't make paper with super long names.
2015-01-21 13:13:13 +01:00
Jordie0608
6140a61de7 Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew()
Conflicts:
	code/modules/food&drinks/food/snacks_pastry.dm
2015-01-21 20:25:45 +11:00
tkdrg
13a7d6d61b Merge pull request #7173 from Carn/#6971
Resolves #6971 - non-lighting_subarea areas are now stored in list/sorte...
2015-01-21 05:06:25 -03:00
tkdrg
561c414ea7 Merge pull request #7134 from AnturK/assemblies
Makes assembly parts work with wires
2015-01-21 04:57:23 -03:00
tkdrg
eebc1c7ac8 Merge pull request #6958 from Iamgoofball/genetic
Re-adds Warm Donk-Pockets
2015-01-21 04:34:58 -03:00
Jordie0608
4a82ff1564 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/pill.dm
	code/modules/reagents/reagent_containers/syringes.dm
2015-01-21 16:54:40 +11:00
pudl
56ea42d17d final commit hopefully, adds some //s back 2015-01-20 23:34:02 -06:00
pudl
39d1642e1f fixes the commenting out issue 2015-01-20 23:30:20 -06:00
Cheridan
fbb0c67ebb Merge pull request #7189 from pudl/nanomed
nanomed update
2015-01-20 23:29:36 -06:00
pudl
305eed5efc fixes a single error w/ overdosing 2015-01-20 23:24:29 -06:00
pudl
10c7b422f1 -capitalizes Ephedrine in sleepers
-cryo now plays a ding when you're ejected
-fixes the salglu description, nerfs it to middle ground between the too-op version and the too-weak version
-buffs synthflesh to 1.5 per cycle, like on goon
-reverts the charcoal buff, it was fine way back when
-fixes morphine not putting you to sleep
-removes drowsiness from diphen, it's not supposed to do that
-epin actually no longer causes stun reduction on goon since it was too op. it's now removed here as well.
-fixes the histamine description. now, instead of it being deadly at any amount, it's accurate to how it is on goon. if it's below 30u, it's purely annoying. even coughs and sneezes don't make you drop items. when you overdose it is very deadly, but not nearly as much as it used to be. changes the dizziness to blurriness as it is on goon.
-cyanide now actually causes losebreath like it's supposed to, and stuns you instead of putting you to sleep for a half a second like it's supposed to.
-cryo spaghetti code removed, it now only heals 3 brute and burn instead of 6.
-chemicals are now mostly colored
-adds mannitol to the cryox recipe, since we can't port one of the chems used in the recipe on goon
-renames polyacid to Fluorosulfuric and makes the recipe a bit harder, but it has more units as a result now.
-syntiflesh is now named synthmeat and requires cryox instead of clonex
-silver sulf now does what the description says it does
-changes the eating message to be less wordy and hugbox
-buffs salacid to make it worth using
-removes ephedrine and salbu addiction, since they're very useful chems that don't need that
-removes ephedrine walkspeed buff, it wasn't supposed to do that. also makes it not stun you and be a grief tool.
-buffs atropine to work as long as you're in crit
-removes ethyl since antihol replaced it
-comments out clf3
-adds an 8tc traitor item, the stimpack. single use 50u syringe that makes you run fast and resistant to stuns a little bit, heals you when you're below 50% health.
2015-01-20 23:21:11 -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
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
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
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
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
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