Commit Graph

1253 Commits

Author SHA1 Message Date
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
Remie Richards
17654037db Ports Mloc's Refactor of buckling, All /obj can now buckle things. HE Pipes now change colour based on heat. 2015-01-14 19:07:18 +00:00
tkdrg
674b3b65c0 Merge pull request #6968 from phil235/LockdownMalfFix
Fixes malf AI lockdown affecting doors on away missions
2015-01-14 14:58:10 -03:00
tkdrg
7fe46696d2 Merge pull request #6963 from Boggart/wizrepulse
Adds a new spell, Repulse.
2015-01-14 14:36:00 -03:00
Boggart
a54b57f629 Adds span classes to repulse spell. 2015-01-14 02:02:17 -07:00
tkdrg
82bff079c7 Merge pull request #6137 from Iamgoofball/byond
Goon Chemistry [FINISHED]
2015-01-14 02:31:56 -03:00
paprka
8bde2dea03 crossbow, speargun, and grenade updates 2015-01-13 20:00:58 -08:00
Swag McYolosteinen
430b613ef4 Merge pull request #6984 from tkdrg/sanitaiz
Replaces a bunch of input() with stripped_input()
2015-01-13 19:32:25 +01:00
Cheridan
1c090e02b7 Merge pull request #6787 from paprka/serviceandsupply
Separates supply from civilian (service) jobs
2015-01-13 02:19:30 -06:00
Cheridan
4bd70b2908 Merge pull request #6986 from Menshin/ear_damage_ooping
Ear damage/deafness tidying
2015-01-13 01:19:56 -06:00
Cheridan
6679b67b89 -Adds pin supply pack
-Updates armory
2015-01-12 23:35:57 -06:00
Incoming
6f0a50381c Adds an antag hud system for wizards.
The huds won't be activated when there's just one wizard, but when another magic user is brought in the huds will appear for both of them to allow for easy identification in the face of rampant mindswaps and/or identity shinanagans and/or getting turned into a cow by a staff of change.

The huds are on by default in ragin' mages.
2015-01-13 00:14:05 -05:00
Iamgoofball
5a91ce4fee Requested changes by @Cheridan 2015-01-12 20:38:56 -08:00
Cheridan
f8e1fac30c Merge branch 'master' of https://github.com/tgstation/-tg-station into pinned 2015-01-12 21:29:00 -06:00
Menshin
435ccf7ff9 * OOP'ed ear damages/deafness status updating
* Silicons are now immuned to ear damages/deafness
* Only living mobs can now take ear damages/be deafened
* Simple animals are now healing ear damages/deafness at the same rate as other living mobs
* Fixes being able to hear AI announcements when deaf
2015-01-13 00:40:46 +01:00
Iamgoofball
38bc14c8f8 Tweaks and changes 2015-01-11 20:35:17 -08:00
Incoming
c46cefd8ff Locks up teleportation spells behind a var, nonabstract_req, that keeps pAI and brain mobs from leaving their respective jail objects.
The crew is none the less emphatically warned of the hilarious danger of putting magic brains in MMIs.
2015-01-11 22:02:19 -05:00
tkdrg
b852aa41ea Replaces a bunch of input() with stripped_input()
Some of these were exploitable for XSS, as well.
2015-01-11 19:02:53 -03:00
Iamgoofball
493dd27679 Merge branch 'master' of https://github.com/tgstation/-tg-station into byond
Conflicts:
	code/modules/reagents/Chemistry-Machinery.dm
	code/modules/reagents/reagent_containers/glass/bottle.dm
2015-01-11 09:53:49 -08:00
phil235
a55e6a70be Fixes malf AI lockdown affecting doors on z levels other than station and mining.
Replaces a lot of z level numbers in code by their respective defines.
Adding a define for the Mining asteroid z level.
2015-01-11 15:39:32 +01:00
Boggart
1d9f7a9a51 Tweaks the upgrade benefit for repulse a bit. 2015-01-11 01:09:28 -07:00
Iamgoofball
b70fde1ed2 Fixes and Tweaks, adds mutations_say_mods() and say_mod() for mutations 2015-01-10 23:42:31 -08:00