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
63456ef622
Many fixes. Adding custom pizza slices. Reducing amount of icons used. Adding a changelog.
2015-02-07 03:10:32 +01: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
f6d7823fc2
Adds muriatic, caustic, and hydrochloride to maint loot
2015-02-05 18:57:58 -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
e894fdc6c1
You will hear the voice of the chosen god in your head.
...
Remove text macros
2015-02-06 00:54:35 +00:00
ec79511215
Merge pull request #7382 from Iamgoofball/patch-21
...
buffs styptic, silver sulf, and synthflesh
2015-02-05 16:16:58 -08:00
eadf32312e
Yet more fixes.
2015-02-06 01:15:58 +01: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
3456b017b6
repo update
2015-02-05 23:00:59 +01: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
e4464b3b9f
Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul
2015-02-05 22:35:00 +01:00
a296e8f6a1
Updating the cook book. Finishing giving filling color to growns. More fixes
2015-02-05 22:34:11 +01: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
bb188da5bf
Merge pull request #7490 from Miauw62/sayfix
...
Fixes saycode breaking when the ckey of a ghost was set to null.
2015-02-05 11:54:23 -08:00
0a6013cfa9
- Some fixes
...
- Adding power var to microwave to reduce microwaving time (with risk of failure)
- Giving unique color to snacks for filling purposes
- cake batter and pie dough can also be made with soy milk
2015-02-05 19:53:34 +01:00
f1329e5794
Fixes ejection issue with the E.X.P.E.R.I-MENTOR
...
Fixes an issue in which manually ejecting an item from the
E.X.P.E.R.I-MENTOR caused it to become inoperable.
2015-02-05 12:47:47 -06:00
f5359aba3b
Merge pull request #7257 from Lo6a4evskiy/Sec_record_photo
...
Adds photos and some other stuff to security and medical records
2015-02-05 18:45:53 +01:00
6fab02e7cd
Merge pull request #7546 from TZK13/Purple-Shorts
...
Adds purple shorts
2015-02-05 18:16:14 +01:00
574fc61c83
Merge pull request #7543 from TZK13/Work-Boots
...
Adds work boots for engineers
2015-02-05 18:15:28 +01:00
0c071c54f0
Merge pull request #7445 from Deantwo/ChemMasterGetsGloomy
...
ChemMaster Update
2015-02-05 18:14:08 +01:00
65a3674969
Merge pull request #7489 from paprka/ghostsa
...
Makes ghosts float up and down ala zero-g
2015-02-05 18:08:38 +01:00
f5653fa923
Merge pull request #7500 from Iamgoofball/patch-27
...
Fixes #7493
2015-02-05 18:07:52 +01:00
aa3f6d8635
Merge pull request #7540 from Delimusca/slimefixins
...
slime feeding hotfix
2015-02-05 18:05:15 +01:00
ac60a828f9
Merge pull request #7536 from Iamgoofball/chemblob
...
fixes my shit
2015-02-05 18:04:54 +01:00
faba71fcca
Cooking overhaul: adding tablecraft food recipes, customizable food, food ingredients (from bay)
...
- converted the microwave recipes to tablecraft recipes
- Added customizable food (thanks iamgoofball)
- added food ingredients (from baystation)
- changing food recipes a bit (replacing stuff with the new food ingredients)
- repurpose the microwave to actually cook certain food items.
- bowl is no longer trash but a reagent_containers/glass that is used in salad/soup recipes
- Changed the hunger system a bit, sugar becomes a normal reagent again. Adding a junkiness var to foods to drain mob satiety.
- milk carton is now a condiment bottle
- slight buff to vitamin
2015-02-05 16:48:25 +01:00
b03a892c85
many improvements to reagent heating
2015-02-05 08:35:04 -07:00
e8dd56a656
Late Fixes
...
- Removed spaces. (such a huge nerf!)
- Fixes https://github.com/tgstation/-tg-station/issues/7091
- Fixes two little errors I made on the CondiMaster's UI.
- Removes "No pill bottle inserted." from CondiMaster.
- Changes the window's default size a little to better suit the changes.
2015-02-05 12:05:12 +01:00
468b00a16f
bandaids diseases and bleeding
2015-02-05 01:36:16 -08:00
d9b28e9c05
whoops
2015-02-04 21:28:49 -08:00
81ba1d61f2
Adds 3 new drugs
2015-02-04 21:27:33 -08:00
2098fd5ea5
Fixes #7497
2015-02-04 18:53:33 -08:00
26873cd973
changes combat requirement to materials
2015-02-04 13:12:43 -08:00
b7994d7c2d
research and different mat requirements for borg upgrades
2015-02-04 13:01:05 -08:00
f6bf89656b
fixes syringes with monkeys, virus transfers, and iv drip feedback
2015-02-04 12:21:05 -08:00
Cheridan
Deantwo
TheVekter
hornygranny
GunHog
phil235
Menshin
Steelpoint
Iamgoofball
paprka
xxalpha
Swag McYolosteinen
Delimusca