Commit Graph

8983 Commits

Author SHA1 Message Date
TZK13 d78322bb42 Adds new schoolgirl uniform colours and adds ties and black skirt to clothesmate. 2015-02-10 06:47:13 -06:00
TZK13 edf3364765 Novaflowers now ignite people with the amount of fire stacks applied depending on potency and you can now juice whole watermelons. 2015-02-10 06:26:03 -06:00
TZK13 b3f164e131 Ports plaid skirts from Baystation12. 2015-02-10 06:10:26 -06:00
TheVekter f26ceabf3a Made Toxins Special and B-52 exclusive to shot glasses.
Tweaked drunkenness to make it less effective at lower booze levels, but moreso at higher.
Changelog.
2015-02-10 02:21:50 -06:00
GunHog 8465c965c0 Adds movement states for some cyborgs
Mining and Mediborgs get new movement states.
Janiborg scubbers will only move when the borg does.
Made mining borg jetpack an overlay.
2015-02-10 00:44:38 -06:00
TheVekter 24ed9dd3e0 Wow apparently I broke the tequila sprite 2015-02-10 00:22:22 -06:00
TheVekter f49abb5117 Adds multiple drinks to the shotglass list so they can be mixed within.
Re-adds bottle of booze that got removed in a merge conflict a while back.
2015-02-09 18:25:03 -06:00
Iamgoofball 75b9f815d3 Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs
Conflicts:
	code/game/machinery/vending.dm
2015-02-09 15:41:29 -08:00
TheVekter ba18c0e925 Adds sprites and iconstates for shot glass. 2015-02-09 17:38:23 -06:00
TheVekter e728185a49 Fixes shot glass sprite changing when something's poured in (TEMP FIX) 2015-02-09 16:55:11 -06:00
GunHog 9cad9c6745 E.X.P.E.R.I-MENTOR changes
Meteor storm event replaced with fireballs.
EMP range reduced.
Bit of flavor stuff added to the 'coffee' reaction results.
Self-duplicating relic nerf to a max of 10 copies of itself, down from
45.
2015-02-09 16:16:58 -06:00
Incoming 81795c81fb Adds a changelog
Adds Robustness
2015-02-09 16:43:18 -05:00
phil235 3afdaabbb2 Merge pull request #7613 from Kraseo/080215
A few bug fixes
2015-02-09 20:35:43 +01:00
Kraseo 80191947e2 ERT now spawn with random names because cheri hates fun 2015-02-09 20:10:29 +01:00
Swag McYolosteinen d9cf21effe Merge pull request #7586 from Menshin/r&d_console_search
Added a search function to fabricators menus
2015-02-09 19:19:25 +01:00
phil235 50632ce59b Fix singularity investigate log showing "X has consumed" instead of "X has been consumed by the singularity." 2015-02-09 17:29:54 +01:00
Deantwo 8c2367a3af Updated those three
- Metabolization Rate is now displayed as units/minute.
- Name of "Overdosage" changed to "Overdose Threshold"
- Name of "Addiction" changed to "Addiction Threshold".
2015-02-09 09:01:30 +01:00
paprka 3e61bba236 defib changes 2015-02-08 17:06:34 -08:00
phil235 c70d17a8eb Rebalancing vitamin amounts in grown
Fixing some sugar amounts in 2 growns
Fixing error from metastation z2 mapfile.
2015-02-08 22:48:53 +01:00
phil235 6e55479a8d Merge pull request #7583 from GunHog/AI_Stat_bugfix
AI status screen now properly reports AFK cyborgs
2015-02-08 21:59:06 +01:00
phil235 732a54fe63 Making all meat subtypes of snacks/meat
Adding specific cutlets and raw cutlets for a lot of types of meat.
Enabling reagent transfer from ingredients to resulting dish for foodtablecrafting
Adjusting tablecraft food recipes reagents accordingly.
Adding raw pastry base and pastry base food and including it into certain recipes.
2015-02-08 21:36:54 +01:00
Swag McYolosteinen 049733d319 Merge pull request #7567 from GunHog/EjectFix
E.X.P.E.R.I-MENTOR fixes
2015-02-08 21:13:52 +01:00
Kraseo 08e7911f57 fixes a bunch of bugs 2015-02-08 13:27:55 +01:00
Incoming 54c40ee0ad Adds a new species var, exotic_blood, that can be used with species that don't have traditional blood so you can still draw something from them if such a thing logically makes sense.
It's used here to allow slime jelly to be drawn from slimepeople (and the far less seen jellypeople)

In both cases slime jelly is produced from nutrition, and will always do so unless you've got either extremely low nutrition or extremely high slime jelly.

Practical effects of this:
*You can kill slimepeople in a few special ways, you can syrigne all the jelly out and once they run out of nutrition to replace it they'll stop breathing, chems that help clear toxins also screw them over BADLY in this way.
*slimepeople get free access to a semipotent toxin whenever they want provided they have a syringe on hand, but have to manage their nutrition if they rely on it.
*Other chems can be syringed wholesale out of slimepeople as well provided they haven't been metabolized yet.
2015-02-08 03:18:50 -05:00
Iamgoofball d14a50d85e Fixes and Changelog 2015-02-07 23:30:55 -08:00
Iamgoofball fa32a61494 Loads of new chemicals and changes 2015-02-07 21:55:21 -08:00
Cheridan 3da8f70e4d fixes #7608 2015-02-07 20:48:50 -06:00
Remie Richards 5b2d3ceada Allows overminds to reroll their chemical at a cost, fixes blob cores being invisible, repaths blob mobs to /hostile/blob 2015-02-08 01:22:51 +00:00
phil235 0aa8e4b5ad Adding a table proc checking whether the table is too crowded to craft things on it.
Two small fixes.
2015-02-08 00:50:19 +01:00
Iamgoofball 0864e4a8dc Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs
Conflicts:
	code/modules/reagents/Chemistry-Goon-Medicine.dm
	code/modules/reagents/reagent_containers/pill.dm
	icons/obj/drinks.dmi
2015-02-07 15:46:12 -08:00
Iamgoofball 46cac2fce6 whoops forgot this 2015-02-07 15:39:05 -08:00
Iamgoofball eea438c42d Literal shitton of changes 2015-02-07 15:37:55 -08:00
Deantwo 0e762dd720 Metabolization and colored text
- Added "Metabolization rate" to the analyze screen.
- Changed the text under the color to the actual hex code.
- Changed the font of the text under the color to "Lucida Console", just
so it is always the same length.
2015-02-08 00:30:11 +01:00
Cheridan 5610b46a0f Merge pull request #7528 from paprka/clothessec
Some clothing changes
2015-02-07 17:00:36 -06:00
Matt Smith b2ad540f78 needed the key,
I dont like this whole function and am kinda feeling to kill it all.
2015-02-07 20:52:45 +00:00
Matt Smith 1246f14dd1 incorrect proc name 2015-02-07 20:37:49 +00:00
phil235 35fb458293 Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul
Conflicts:
	code/modules/food&drinks/food/snacks_other.dm
	icons/obj/drinks.dmi
2015-02-07 20:22:49 +01:00
phil235 f6b0f57e89 last fixes I hope:
tiny change to latexballoon (b/c I reorganized is_sharp proc already, so why not)
some fixes suggested by razharas in table.dm
Renamed microwave to microwave oven. Adding efficiency effect (upgrading the machine)
Adding rolling pins to the kitchen vending machine (so the two cooks don't fight.
2015-02-07 20:10:11 +01:00
Remie Richards c4af140159 Merge pull request #7511 from paprka/cool
adds a skeleton ghost for byond supporters
2015-02-07 16:48:52 +00:00
Cheridan 2b880ff4ff honk 2015-02-07 10:12:40 -06:00
Matt Smith ae0b1cf606 remove some duplicate code 2015-02-07 15:52:11 +00:00
Cheridan 6d3584fa63 Pin Fixes
Implant pins now require the actual specific implant instead of allowing any implant at all.
2015-02-07 09:43:03 -06:00
Menshin e154d69b0b * Fixes warnings related to add_reagent when trying to inject blood containing reagents
* Fixes sleepers showing reagent id instead of name
* Some formatting adjustments to the mass spectrometer output

* Make the "Saline-Glucose Solution" name fit in one line.
2015-02-07 16:32:25 +01:00
Cheridan 6bfbbaa65b Merge pull request #7390 from Steelpoint/SecBorgDisabler
[BALANCE|NERF] Replace's Sec Borg's AdvTaser with a Disabler
2015-02-07 08:46:57 -06:00
Deantwo 89a534203e Analyze Upgrade
ChemMaster changes:
- Analyze screen now displays more information about the reagent;
reagent_state, color, overdose_threshold, and addiction_threshold.
- Moved the href_list["main"] up to below href_list["analyze"].
- Analyze href changed to send a pointer to the target reagent.
- Minor change to tranfering between beaker and buffer.
2015-02-07 10:07:06 +01:00
TheVekter 78c5c66afb Note: Compile before you commit ffs 2015-02-07 00:31:12 -06:00
TheVekter 4fb8b34ee0 Merge remote-tracking branch 'remotes/upstream/master' into changesafecontents
Conflicts:
	code/modules/food&drinks/drinks/drinks/bottle.dm
2015-02-07 00:18:39 -06:00
hornygranny c5d4dc7ff4 Merge pull request #7568 from TheVekter/typofix
Fixes a few typos
2015-02-06 21:55:09 -08:00
GunHog e20c6dd788 Drone Access get
DRONE POWAH
2015-02-06 22:17:36 -06:00
phil235 63456ef622 Many fixes. Adding custom pizza slices. Reducing amount of icons used. Adding a changelog. 2015-02-07 03:10:32 +01:00