hornygranny
f64fb21f47
Merge pull request #7955 from Jordie0608/greytiderahelps!admintakes10braindamage!
...
Fixes #7288 VV, moreinfo stamina display and replaces CA with TP
2015-02-25 19:53:41 -08:00
Jordie0608
6b815c7801
Stamina on adminmoreinfo and vv; ahelp and pray CA replaced by TP
2015-02-24 20:02:43 +11:00
Iamgoofball
4735e1c02a
Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs
2015-02-23 18:47:21 -08:00
Razharas
e889ee7a42
Merge pull request #7700 from RemieRichards/ExplosionsAndEmbedding
...
Items Embedding in Limbs
2015-02-24 01:22:01 +03:00
hornygranny
a5a7b590d3
Merge pull request #7866 from phil235/PullBuckleFix
...
Fixes being able to break free from a pull while handcuffed if the puller is buckled.
2015-02-22 20:18:54 -08:00
hornygranny
7b8a8a3308
Merge pull request #7870 from phil235/WindowFormattingFix
...
Two window fixes
2015-02-22 20:18:21 -08:00
hornygranny
c0c8a739e2
Merge pull request #7721 from paprka/miening
...
Mining & mine-related chem changes
2015-02-22 20:17:24 -08:00
Swag McYolosteinen
8e4982276a
Merge pull request #7825 from RandomMarine/cargokits
...
Adds brute first aid kits to cargo.
2015-02-22 12:06:22 +01:00
phil235
19e3cd5d1e
Fixes a window's size and a colored text in another one.
2015-02-21 16:24:13 +01:00
phil235
e9a943218c
Fixes being able to break free from a pull while handcuffed if the puller is buckled.
...
Add the incapacitated proc to mobs to check for stat, stun, weakened, paralysis, restrained. And replacing those checks by that new proc in some places.
2015-02-21 14:49:47 +01:00
Iamgoofball
e24e94544e
Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs
...
Conflicts:
code/modules/food&drinks/food/snacks_meat.dm
code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
icons/obj/drinks.dmi
icons/obj/food.dmi
2015-02-20 22:00:53 -08:00
hornygranny
ea12d68e60
Merge pull request #7817 from paprka/whatthefucktg
...
Syndicate shotguns spawn with buckshot by default
2015-02-19 13:07:08 -08:00
Remie Richards
42fe551665
Merge branch 'master' of https://github.com/tgstation/-tg-station into ExplosionsAndEmbedding
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2015-02-19 18:16:33 +00:00
Menshin
0d0ef9e02a
Deactivates the Hidden Syndicate Teleportation Device
2015-02-19 16:34:49 +01:00
RandomMarine
b0d591f110
Adds brute kits to cargo
2015-02-18 20:41:47 -08:00
paprka
efbb4f5116
makes syndicate shotguns spawn with buckshot by default
2015-02-18 14:10:46 -08:00
phil235
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
paprka
88760896ad
initial commit
2015-02-13 20:59:39 -08:00
Remie Richards
34ced43f45
Explosions throw items, items can embed in limbs, embedded items cause damage, embedded items can fall out, surgery for embedded item removal, ninja throwing stars!
2015-02-13 12:59:02 +00:00
Cheridan
216630f1db
Merge pull request #7572 from phil235/CookingOverhaul
...
Cooking overhaul
2015-02-12 08:01:17 -06:00
phil235
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
Cheridan
65e8a4ce31
Merge pull request #7624 from paprka/defibfuckupv2
...
Defib changes
2015-02-11 08:37:28 -06:00
Iamgoofball
575b117a70
Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs
...
Conflicts:
icons/obj/drinks.dmi
2015-02-10 21:37:49 -08:00
Swag McYolosteinen
e5e8b27790
Merge pull request #7491 from paprka/simplyepicbuff
...
Removes range from ebow bolts + price revert + bugfix
2015-02-10 17:15:44 +01:00
paprka
3e61bba236
defib changes
2015-02-08 17:06:34 -08: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
eea438c42d
Literal shitton of changes
2015-02-07 15:37:55 -08: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
TZK13
1ff9f89062
Fixes revitiligo.
2015-02-05 17:00:54 -06:00
phil235
3456b017b6
repo update
2015-02-05 23:00:59 +01:00
phil235
e4464b3b9f
Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul
2015-02-05 22:35:00 +01:00
Razharas
b9363249b3
Merge pull request #7471 from Menshin/properly_propelled_sanitization
...
HTML sanitization tweaking
2015-02-05 22:27:35 +03:00
Swag McYolosteinen
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
Swag McYolosteinen
5cb2392f1e
Merge pull request #7197 from TZK13/New-Disease-Symptoms
...
Adds three new disease symptoms
2015-02-05 18:09:53 +01:00
Swag McYolosteinen
ac60a828f9
Merge pull request #7536 from Iamgoofball/chemblob
...
fixes my shit
2015-02-05 18:04:54 +01:00
phil235
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
Lo6a4evskiy
50cc057504
Lots of fixes and improvements
2015-02-04 17:35:42 +04:00
Iamgoofball
9a1036d43b
Fixes #6991
2015-02-03 20:26:58 -08:00
Iamgoofball
a480ffbc98
whole lotta bugfixes
2015-02-03 17:57:57 -08:00
Cheridan
80913f143b
Merge pull request #7239 from paprka/ointmentandshit
...
BLOOD FOR THE BLOOD GOD
2015-02-03 16:30:42 -06:00
hornygranny
078c8caaea
Merge pull request #7453 from Iamgoofball/patch-23
...
Fixes #7312
2015-02-02 18:26:36 -08:00
Swag McYolosteinen
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
xxalpha
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
paprka
63f72f9445
increased cost
2015-02-01 03:58:22 -08:00
Swag McYolosteinen
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
Deantwo
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
paprka
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
Menshin
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
Incoming
1610303826
Indentation is the keye
2015-01-31 01:38:39 -05:00
Iamgoofball
a3d2b769d9
Fixes #7312
...
Fixes #7312
2015-01-30 16:20:30 -08:00
