c9f9d30227
Air Alarm Deconstruction fix: you no longer need to cut the syphon wire to deconstruct the air alarm.
...
You can no longer open or interact with the wire window after the wires are removed.
You can no longer cut the final wire while the panel is closed.
Adding wires to the air alarm now properly reset the variables that the wires change upon cutting/pulsing.
2015-02-14 17:53:22 +01:00
216630f1db
Merge pull request #7572 from phil235/CookingOverhaul
...
Cooking overhaul
2015-02-12 08:01:17 -06:00
549b71a487
Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul
...
Conflicts:
icons/obj/drinks.dmi
Fixing a couple typos. Making sure all eggs used in tablecraft recipes are boiled
2015-02-11 16:13:04 +01:00
65e8a4ce31
Merge pull request #7624 from paprka/defibfuckupv2
...
Defib changes
2015-02-11 08:37:28 -06: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
3e61bba236
defib changes
2015-02-08 17:06:34 -08:00
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
1ff9f89062
Fixes revitiligo.
2015-02-05 17:00:54 -06:00
3456b017b6
repo update
2015-02-05 23:00:59 +01:00
e4464b3b9f
Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul
2015-02-05 22:35:00 +01:00
b9363249b3
Merge pull request #7471 from Menshin/properly_propelled_sanitization
...
HTML sanitization tweaking
2015-02-05 22:27:35 +03: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
5cb2392f1e
Merge pull request #7197 from TZK13/New-Disease-Symptoms
...
Adds three new disease symptoms
2015-02-05 18:09:53 +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
50cc057504
Lots of fixes and improvements
2015-02-04 17:35:42 +04:00
9a1036d43b
Fixes #6991
2015-02-03 20:26:58 -08:00
a480ffbc98
whole lotta bugfixes
2015-02-03 17:57:57 -08:00
80913f143b
Merge pull request #7239 from paprka/ointmentandshit
...
BLOOD FOR THE BLOOD GOD
2015-02-03 16:30:42 -06:00
078c8caaea
Merge pull request #7453 from Iamgoofball/patch-23
...
Fixes #7312
2015-02-02 18:26:36 -08:00
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
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
63f72f9445
increased cost
2015-02-01 03:58:22 -08:00
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
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
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
4256f3b8fd
* Made the strip_html_properly() proceed the text in one pass
...
* Added stripping everything between http and ://, to prevent links being passed to Byond text window
* Stripped an unsafe inputting for advanced diseases
2015-01-31 18:48:17 +01:00
1610303826
Indentation is the keye
2015-01-31 01:38:39 -05:00
a3d2b769d9
Fixes #7312
...
Fixes #7312
2015-01-30 16:20:30 -08:00
c8e3b33687
(｡´>д<)っ彡☆
...
Y'all making me do actual refactoring in a silly pull
2015-01-29 18:59:25 -05:00
b5ec328983
New contraband supply item: 50 butterflies
...
(◕‿◕✿)
2015-01-29 18:07:34 -05:00
3bb7213d14
Merge pull request #7346 from paprka/hoodshit
...
New hood/hardsuit helmet system
2015-01-29 18:57:25 +01:00
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
ff51176408
Merge pull request #7344 from RemieRichards/ShowAntagPrefs
...
Traitor Panel: Antag Preferences Shown.
2015-01-28 14:49:15 +01:00
04ffb67406
Fixes some more dna issues
...
Fixes dna diseases fucking up monkeys
Fixes lasereyes being gainable
2015-01-27 07:22:37 +03:00
c43092efa9
Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit
2015-01-25 21:56:39 -08:00
2c25a68795
Update epilepsy code to use visible message instead of legacy code
2015-01-26 16:33:24 +13:00
a5a9e297d4
new hood system
2015-01-25 00:22:52 -08:00
120402e36f
added blood packs and iv drips to cargo
2015-01-24 21:27:24 -08:00
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
bfd74684b4
Tweaks as noted, added myself to admins.txt
2015-01-24 16:14:44 +04:00
5ac37a6b69
updates packs
2015-01-24 01:36:38 -08:00
8dfaed5fe4
Merge pull request #6871 from fleure/syndiebux
...
Adds briefcase with cash to uplink
2015-01-23 22:24:50 -06:00
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
e5ceac8acd
Lowers both skin symptoms from level 5 to 4.
2015-01-22 20:35:52 -06:00
de12010e31
Fixes the font issues, removes 3 mutations R.I.P
2015-01-22 17:28:13 -08:00
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
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
c6a13419a9
Compile, you damn dirty code
2015-01-21 22:09:52 +04:00
21773c0d05
Merge branch 'master' into Sec_record_photo
2015-01-21 21:40:14 +04:00
phil235
Cheridan
Swag McYolosteinen
paprka
TZK13
Razharas
Lo6a4evskiy
Iamgoofball
hornygranny
xxalpha
Deantwo
Menshin
Incoming
Razharas
Francis Devine
Remie Richards
Jordie0608
tkdrg