Cheridan
80913f143b
Merge pull request #7239 from paprka/ointmentandshit
...
BLOOD FOR THE BLOOD GOD
2015-02-03 16:30:42 -06:00
hornygranny
078c8caaea
Merge pull request #7453 from Iamgoofball/patch-23
...
Fixes #7312
2015-02-02 18:26:36 -08:00
Swag McYolosteinen
9bddcb3df4
Merge pull request #7492 from xxalpha/spacesuit_storage
...
Repath all non jetpack tank types to tank/internals
2015-02-02 18:52:51 +01:00
xxalpha
a9c181bbcc
Repath all non jetpack tank types to tank/internals
...
Repath all portable tanks to tank/internals, except jetpacks
Update ministation
2015-02-01 18:25:39 +00:00
Swag McYolosteinen
bc8b506185
Merge pull request #7463 from Incoming5643/indentationmatters
...
Fixes an incorrect indentation that was leaving invisible comatose mobs all over the place
2015-02-01 12:45:40 +01:00
Deantwo
f6f4318f23
Fixes the Goof fix
...
Fixes https://github.com/tgstation/-tg-station/pull/7453
I wouldn't wish any of these mutations on my worst enemy.
2015-02-01 11:25:59 +01:00
paprka
a661e58281
Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-01-31 22:03:00 -08:00
Incoming
1610303826
Indentation is the keye
2015-01-31 01:38:39 -05:00
Iamgoofball
a3d2b769d9
Fixes #7312
...
Fixes #7312
2015-01-30 16:20:30 -08:00
Incoming
c8e3b33687
(｡´>д<)っ彡☆
...
Y'all making me do actual refactoring in a silly pull
2015-01-29 18:59:25 -05:00
Incoming
b5ec328983
New contraband supply item: 50 butterflies
...
(◕‿◕✿)
2015-01-29 18:07:34 -05:00
Swag McYolosteinen
3bb7213d14
Merge pull request #7346 from paprka/hoodshit
...
New hood/hardsuit helmet system
2015-01-29 18:57:25 +01:00
Cheridan
4825a20526
Merge pull request #7366 from optimumtact/epilepsywarning
...
Update epilepsy code to use visible message instead of legacy code
2015-01-28 09:15:02 -06:00
Swag McYolosteinen
ff51176408
Merge pull request #7344 from RemieRichards/ShowAntagPrefs
...
Traitor Panel: Antag Preferences Shown.
2015-01-28 14:49:15 +01:00
Razharas
04ffb67406
Fixes some more dna issues
...
Fixes dna diseases fucking up monkeys
Fixes lasereyes being gainable
2015-01-27 07:22:37 +03:00
paprka
c43092efa9
Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit
2015-01-25 21:56:39 -08:00
Francis Devine
2c25a68795
Update epilepsy code to use visible message instead of legacy code
2015-01-26 16:33:24 +13:00
paprka
a5a9e297d4
new hood system
2015-01-25 00:22:52 -08:00
paprka
120402e36f
added blood packs and iv drips to cargo
2015-01-24 21:27:24 -08:00
Remie Richards
e24824943e
Adds a note about whether an Antag role is enabled in the player's preferences, in their Traitor Panel
2015-01-25 04:09:27 +00:00
paprka
5ac37a6b69
updates packs
2015-01-24 01:36:38 -08:00
Cheridan
8dfaed5fe4
Merge pull request #6871 from fleure/syndiebux
...
Adds briefcase with cash to uplink
2015-01-23 22:24:50 -06:00
Cheridan
1428a5a16d
Merge pull request #7290 from Iamgoofball/goonchem_shoehorn_backup
...
Fixes the font issues, removes 3 mutations R.I.P
2015-01-23 21:39:42 -06:00
Iamgoofball
de12010e31
Fixes the font issues, removes 3 mutations R.I.P
2015-01-22 17:28:13 -08: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
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
Swag McYolosteinen
c1edbb3ffc
Merge pull request #7238 from pudl/chemstuff2
...
goonchem fixes take 2
2015-01-21 17:27:04 +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
561c414ea7
Merge pull request #7134 from AnturK/assemblies
...
Makes assembly parts work with wires
2015-01-21 04:57:23 -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
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
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
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
Alek2ander
6eee450855
Fixes genetics
2015-01-20 23:01:35 +03: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
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
Jordie0608
a643ecdfcc
Food and drinks refactor
2015-01-19 18:06:15 +11: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
b83ca5f8d1
Goon Chemistry: Addiction and Overdosing
2015-01-18 21:50:54 -08:00
Iamgoofball
b64efc6b54
Adds 3 new disabilities
2015-01-17 18:55:41 -08:00
paprka
a2fe7f0352
bloat killer 9000
2015-01-17 16:36:27 -08:00
AnturK
a8ddd45690
Makes assembly parts work with wires
2015-01-17 18:08:55 +01:00
Iamgoofball
35cc6e3c54
Replaces pathing.
2015-01-16 18:21:01 -08:00
Iamgoofball
38070820f3
Merge branch 'master' of https://github.com/tgstation/-tg-station into goonchem_shoehorn_backup
2015-01-16 17:25:50 -08:00
Iamgoofball
f3398e58a9
Removes Star Trek chemistry and transfers us to Goon Chemistry.
2015-01-16 17:21:36 -08:00
Incoming
071e2aee3c
fixes conflicts
...
swaps appretice and wizard icons
2015-01-16 13:45:36 -05:00
paprka
ab7d50c90e
Merge branch 'master' of https://github.com/tgstation/-tg-station into nosenseofrightandwrongiguess
...
Conflicts:
code/game/gamemodes/wizard/rightandwrong.dm
code/modules/projectiles/guns/projectile/launchers.dm
code/modules/projectiles/guns/projectile/shotgun.dm
code/modules/research/designs/weapon_designs.dm
icons/obj/gun.dmi
2015-01-15 21:56:23 -08:00
Cheridan
5f46ebe2b9
Merge branch 'master' of https://github.com/tgstation/-tg-station into pinned
2015-01-15 16:14:27 -06:00
