39e4af6c72
update sec hardsuit sprites, fix armor values
2015-02-13 14:04:38 -05:00
d3a439a0a1
Changes the sec hardsuit to be slightly more armored and HoS exclusive, armory hardsuits are now slimmer
2015-02-12 15:53:37 -05:00
e971a1af29
Merge pull request #7592 from psykzz/patch-8
...
remove some duplicate code
2015-02-10 18:04:43 +01:00
748341131c
Merge pull request #7588 from Deantwo/ChemicalAnalyzing
...
Analyze Upgrade
2015-02-10 18:03:37 +01:00
811a65f932
Merge pull request #7566 from Delimusca/chemheating
...
reagent temperature enhancements
2015-02-10 18:02:37 +01:00
cfacd3bf9f
Merge pull request #7589 from Menshin/reagents_warnings_fix
...
Fixes warnings related to add_reagent
2015-02-10 17:55:32 +01:00
a62cbb77e5
Merge pull request #7501 from Iamgoofball/patch-28
...
makes epipens more powerful at stopping losebreath
2015-02-10 17:50:47 +01:00
f130872f4e
Merge pull request #7517 from RemieRichards/MovableUIElements
...
Movable UI Elements!
2015-02-10 17:50:33 +01:00
bc64407000
Merge pull request #7582 from GunHog/FreePointsForHumanMiners
...
Lets Silicons and Drones use the Ore Redemption Machine
2015-02-10 17:46:03 +01:00
f48f254513
Merge pull request #7611 from Incoming5643/youjelly
...
Exotic Blood
2015-02-10 17:43:44 +01:00
7882b3898b
Merge pull request #7631 from phil235/SinguloInvestigateLogFix
...
Fix singularity investigate log
2015-02-10 17:41:06 +01:00
e5e8b27790
Merge pull request #7491 from paprka/simplyepicbuff
...
Removes range from ebow bolts + price revert + bugfix
2015-02-10 17:15:44 +01:00
3afdaabbb2
Merge pull request #7613 from Kraseo/080215
...
A few bug fixes
2015-02-09 20:35:43 +01:00
80191947e2
ERT now spawn with random names because cheri hates fun
2015-02-09 20:10:29 +01:00
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
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
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
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
049733d319
Merge pull request #7567 from GunHog/EjectFix
...
E.X.P.E.R.I-MENTOR fixes
2015-02-08 21:13:52 +01:00
08e7911f57
fixes a bunch of bugs
2015-02-08 13:27:55 +01:00
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
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
5610b46a0f
Merge pull request #7528 from paprka/clothessec
...
Some clothing changes
2015-02-07 17:00:36 -06:00
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
1246f14dd1
incorrect proc name
2015-02-07 20:37:49 +00:00
c4af140159
Merge pull request #7511 from paprka/cool
...
adds a skeleton ghost for byond supporters
2015-02-07 16:48:52 +00:00
ae0b1cf606
remove some duplicate code
2015-02-07 15:52:11 +00:00
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
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
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
78c5c66afb
Note: Compile before you commit ffs
2015-02-07 00:31:12 -06:00
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
c5d4dc7ff4
Merge pull request #7568 from TheVekter/typofix
...
Fixes a few typos
2015-02-06 21:55:09 -08:00
e20c6dd788
Drone Access get
...
DRONE POWAH
2015-02-06 22:17:36 -06:00
3ef71865f1
Added a search function to the R&D Console protolathe and imprinter menus
2015-02-07 01:57:46 +01:00
fa9cadfb09
AI's tracker now properly reports AFK borgs
...
- Adds borg client check to the Status screen for the AI
2015-02-06 16:15:28 -06:00
20beb90adf
Lets Silicons use the Ore Redemption Machine
...
- Silicons can now use the Ore Redeemer.
Codernote: I removed the "istype(inserted_id)" checks for the release
and plasteel functions as they do not do anything to the ID inside
except the check_access() proc. That proc returns 0 if called when no ID
is inserted, so it can safely be removed from those two options.
2015-02-06 15:43:41 -06:00
ff65ec2018
Fixed "Chilli" -> "Chili" and "Coco" -> "Cocoa". Pray it passes Travis.
2015-02-06 05:22:53 -06:00
4e2b2fe20c
Adds new top-shelf vodka to the safe (also there's a bottle hidden on the station see if you can find it~)
2015-02-06 02:29:23 -06:00
98465ea1dd
Adds the new rare Vodka to the game and to the Safe.
2015-02-06 00:21:02 -06:00
92f5bc2dc8
MergeConflict
2015-02-06 13:21:23 +08:00
ea3bb2e80b
Merge branch 'master' of https://github.com/tgstation/-tg-station into SecBorgDisabler
...
Conflicts:
code/modules/research/designs/mechfabricator_designs.dm
2015-02-06 13:19:15 +08:00
4074037954
Adds shot glasses to the game.
2015-02-05 20:48:34 -06:00
c527491f41
Merge branch 'master' of https://github.com/tgstation/-tg-station into clothessec
...
Conflicts:
icons/mob/uniform.dmi
icons/obj/clothing/uniforms.dmi
2015-02-05 17:44:22 -08:00
2ef8848c74
adds ability to store ammo and any type of revolver in holster
2015-02-05 17:41:10 -08:00
ec79511215
Merge pull request #7382 from Iamgoofball/patch-21
...
buffs styptic, silver sulf, and synthflesh
2015-02-05 16:16:58 -08:00
b70e95d858
Deconstruction fix
...
When deconstructed, the Experimentor will now spit out any item it
contains, should it have one.
2015-02-05 16:23:59 -06:00
44888bdcfb
INCREASES SANITY!!
...
- Fixes a bug in which ejected items are sent to a null turf.
- Added a sanity check when the machine tries to throw a null object.
- Relic discovery works again!
2015-02-05 16:07:21 -06:00
9bc2137815
man fuck typos
...
Whoops, might wanna update on my end before changing a path.
Fixed typo 'Tequilla'.
2015-02-05 15:43:09 -06:00
7accea7f6b
Merge pull request #7554 from paprka/ablightonrobotics
...
Research and different mat requirements for borg upgrades
2015-02-05 11:57:22 -08:00
dannno
Swag McYolosteinen
phil235
Kraseo
phil235
Deantwo
Incoming
Cheridan
Matt Smith
Remie Richards
Menshin
TheVekter
hornygranny
GunHog
Steelpoint
paprka