cc474b2af6
Merge pull request #6591 from phil235/FingerlessSpriteFix
...
Fix fingerless gloves icon and washing machine changing boxing gloves
2014-12-27 15:46:43 -03:00
87d0cbdb2b
Merge branch 'master' of https://github.com/tgstation/-tg-station into fixescargo
...
Conflicts:
code/modules/clothing/head/helmet.dm
2014-12-26 22:31:54 -08:00
b6e35278e3
Fixes cutting black gloves to make fingerless gloves not changing the icon to fingerless.
...
Fixes the washing machine being able to change boxing gloves, ninja gloves and botany gloves to look like simple colored gloves. Creating a /gloves/color category for all gloves whose color can be changed.
Fixing some absolute pathing.
2014-12-26 17:04:09 +01:00
c75c6e493a
removes broken tactical helmets crate
2014-12-25 18:10:10 -08:00
cf41dab26f
Conflict fixing
2014-12-25 22:34:40 +01:00
595ad8df58
fixed compile errors
2014-12-24 21:03:22 -08:00
495604228c
Merge pull request #6455 from paprka/bayports
...
Ports manifest / better ready button(s)
2014-12-24 11:54:40 +01:00
73f5d8db9c
fixes bugs
2014-12-23 12:07:32 -08:00
c9c14feec6
Merge pull request #6411 from wild-billy/master
...
Reserve PascalCase inits
2014-12-18 02:30:08 -06:00
adc09ffe41
initial commit for bay ports
2014-12-17 23:42:09 -08:00
7ea29f961e
Merge pull request #6404 from tkdrg/moarfuntiems
...
Fixes 2 runtimes
2014-12-17 11:03:41 -08:00
66d36f74d2
Reserve PascalCase inits
2014-12-16 12:29:04 +02:00
3e90c2863e
Fixes 2 runtimes
...
Fixes antag hud runtime due to checking the mind before transferring it.
Fixes floorbot runtime due to typecasting with no sanity checks.
2014-12-15 22:30:23 -03:00
c5ba564993
Merge pull request #6374 from phil235/SneezingSpreadFix
...
Fixing sneezing symptom not spreading its virus airborne.
2014-12-15 16:27:27 -08:00
b143e41b88
Merge pull request #6265 from Miauw62/HOHOHO
...
SANTA IS COMING TO STATION
2014-12-14 23:58:28 -06:00
ba452b9f2b
Removing the hardcoded spread_range value when there's a force_spread.
2014-12-14 23:14:26 +01:00
c2ddfc0155
Fixing sneezing symptom not spreading its virus airborne.
2014-12-14 22:24:10 +01:00
b67043f267
Merge pull request #6329 from phil235/HungerChange
...
Hunger change
2014-12-14 12:55:21 -06:00
8e51963a16
Moving satiety protection against catching virus from CanContractDisease() to carbon/ContractDisease() so virus injection with syringe or pill isn't affected by the satiety resistance.
2014-12-14 15:49:51 +01:00
bafef911d4
Merge pull request #6317 from paprka/saltyfuckingcuntm8
...
Security aesthetic overhaul
2014-12-14 07:57:33 +03:00
04fda27969
* Updated the autolathe to use the datum/designs system (new file
...
autolathe_designs.dm)
* Added categories sub-menus for the autolathe, circuit_printer and
protolathe
2014-12-13 22:56:43 +01:00
f87da5939a
Making nutrition level values into defines.
...
Adding a changelog.
Snack vending machine's chef compartment is locked with kitchen access but can be emagged or hacked.
Adding feedback message for the user when its metabolism_efficiency changes.
Negative satiety can make you jitter a little bit at times. (probability linked to your satiety)
2014-12-13 17:15:35 +01:00
29bde9a48a
Satiety now gives a resistance to catching disease (up to 60%)
...
Snack machine compartment can now only be loaded by using a tray.
Fixes tray being unable to pickup omelette.
2014-12-12 21:21:56 +01:00
5c104d6e55
fixing a typo
2014-12-12 14:35:27 +01:00
f9dff2f626
Balancing nutrition and fixing some nutrition stuff that I had missed.
2014-12-12 13:59:31 +01:00
3240cbea99
Tactical armor, etc
2014-12-12 00:23:16 -08:00
b3c4d239c5
fixes c90 uplink
2014-12-11 13:48:10 -08:00
7bd9b86652
Changes the hunger system in various ways. New hunger hud icons. Food w/o sugar can be loaded in snack vending machines by anyone. Adding two new var for mobs "satiety" and "metabolism efficiency". Rearranging datum/reagents, all "good" medical reagents are under datum/reagent/medicine/ and all food&drink reagents are under datum/reagent/consumable. Adding a pizza crate to cargo orders. Growns and cooked food are given vitamins while junk food are all given sugar. Removed some unnecessary code in Chemistry-Reagents.dm .
...
high satiety+fed = higher metabolism_efficiency, lower if starving. Sugar digested drains satiety and vitamin raises satiety. Negative satiety means faster nutrition drop. Positive high satiety means lower chance to spread viruses. metabolism efficiency affect metabolization speed of healing and damaging reagents and the efficiency of bodytemp stabilization via calory use.
2014-12-11 20:46:27 +01:00
91d6fb38b9
Merge pull request #6245 from tkdrg/hudwhyyoudothistome
...
/datum/atom_hud (Passive HUDs) bugfixes
2014-12-11 08:39:12 -06:00
f9cf4f233d
Merge pull request #6263 from paprka/gunsthegunnening
...
Guns: the gunnening
2014-12-11 10:46:34 +03:00
f917bd2906
fixed some double periods
2014-12-08 19:13:44 -08:00
b01e6ba882
Generic names and buffs
2014-12-08 16:49:48 -08:00
e2c15d5210
Merge branch 'master' of https://github.com/tgstation/-tg-station into hudwhyyoudothistome
...
Conflicts:
code/modules/hydroponics/hydroponics.dm
2014-12-08 13:48:22 -03:00
12279d9c8e
Adds a santa event where a dead player is spawned as Santa! HO HO HO!
...
Also adds a few more things to the random gifts.
2014-12-08 17:03:52 +01:00
f19f4d04b1
typo fix
2014-12-08 01:33:44 -08:00
837e42fb3f
last minute changes to the uplink
2014-12-07 23:27:45 -08:00
5b6039a521
changes to the uplink and further c90 updates
2014-12-07 19:39:24 -08:00
3e97e935af
/datum/atom_hud (Passive HUDs) bugfixes
...
Moves antag_hud image and datum to mind instead of mob.
Fixes mobs keeping data HUDs after transfer_to().
Fixes gibbed bodies losing their antag HUDs.
Fixes the data hud disappearing when dropping unrelated HUDs.
Fixes #6206
Fixes #6209
2014-12-06 15:05:23 -03:00
9e9b8b440d
adds winter coats and changes labcoat toggling
2014-12-04 21:29:21 -08:00
2425903320
intial commit, renames stechkin
2014-12-04 18:13:50 -08:00
7d9c9bd5fc
Fixing fake_gbs, gbs, magnitis and maybe other diseases not being curable.
2014-11-28 22:31:04 +01:00
bc7a7a7452
Merge pull request #6084 from tkdrg/hudindahood
...
Fixes data/antag HUD bugs
2014-11-27 13:50:34 -08:00
7153becc62
Fixes implants not updating the implant secHUD
...
Makes med huds /carbon because of monkeys
Makes HUDs update after implant removal surgery
Fixes cloning not recovering antag huds
2014-11-27 12:56:17 -03:00
64777be5d5
Merge pull request #6070 from Razharas/VirShit
...
Final fix for viruses not working
2014-11-26 13:32:29 -08:00
096a7c3770
Merge pull request #6013 from tkdrg/dropthesoap
...
Fixes wizard slipping on all the area soaps
2014-11-26 11:36:31 -06:00
7625b278bd
Final fix for viruses not working
...
Spent entire round as antag trying to figure out why super calculated
engineered viruses dont work
Now, they will ACTUALLY WORK
2014-11-26 00:57:02 +03:00
21b8df82d5
Merge pull request #5908 from tkdrg/hud
...
Makes data and antag huds passive and creates /datum/atom_hud
2014-11-25 12:53:03 -08:00
e38d787c97
Fixes roundstart runtime involving HUDs
2014-11-24 22:22:58 -03:00
3d01e77dba
Merge pull request #5998 from Razharas/SpellRun
...
Fixes disabilities spell runtime
2014-11-23 15:34:22 -08:00
51b6253315
Merge pull request #5964 from phil235/ViroFix1
...
Fixing viruses not working.
2014-11-23 00:56:29 -06:00
tkdrg
paprka
phil235
Menshin
Swag McYolosteinen
Cheridan
hornygranny
Wild Bill
Razharas
Razharas