Commit Graph

1143 Commits

Author SHA1 Message Date
Cheridan
c9c14feec6 Merge pull request #6411 from wild-billy/master
Reserve PascalCase inits
2014-12-18 02:30:08 -06:00
hornygranny
7ea29f961e Merge pull request #6404 from tkdrg/moarfuntiems
Fixes 2 runtimes
2014-12-17 11:03:41 -08:00
Wild Bill
66d36f74d2 Reserve PascalCase inits 2014-12-16 12:29:04 +02:00
tkdrg
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
hornygranny
c5ba564993 Merge pull request #6374 from phil235/SneezingSpreadFix
Fixing sneezing symptom not spreading its virus airborne.
2014-12-15 16:27:27 -08:00
Cheridan
b143e41b88 Merge pull request #6265 from Miauw62/HOHOHO
SANTA IS COMING TO STATION
2014-12-14 23:58:28 -06:00
phil235
ba452b9f2b Removing the hardcoded spread_range value when there's a force_spread. 2014-12-14 23:14:26 +01:00
phil235
c2ddfc0155 Fixing sneezing symptom not spreading its virus airborne. 2014-12-14 22:24:10 +01:00
Cheridan
b67043f267 Merge pull request #6329 from phil235/HungerChange
Hunger change
2014-12-14 12:55:21 -06:00
phil235
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
Razharas
bafef911d4 Merge pull request #6317 from paprka/saltyfuckingcuntm8
Security aesthetic overhaul
2014-12-14 07:57:33 +03:00
phil235
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
phil235
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
phil235
5c104d6e55 fixing a typo 2014-12-12 14:35:27 +01:00
phil235
f9dff2f626 Balancing nutrition and fixing some nutrition stuff that I had missed. 2014-12-12 13:59:31 +01:00
paprka
3240cbea99 Tactical armor, etc 2014-12-12 00:23:16 -08:00
paprka
b3c4d239c5 fixes c90 uplink 2014-12-11 13:48:10 -08:00
phil235
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
Cheridan
91d6fb38b9 Merge pull request #6245 from tkdrg/hudwhyyoudothistome
/datum/atom_hud (Passive HUDs) bugfixes
2014-12-11 08:39:12 -06:00
Razharas
f9cf4f233d Merge pull request #6263 from paprka/gunsthegunnening
Guns: the gunnening
2014-12-11 10:46:34 +03:00
paprka
f917bd2906 fixed some double periods 2014-12-08 19:13:44 -08:00
paprka
b01e6ba882 Generic names and buffs 2014-12-08 16:49:48 -08:00
tkdrg
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
Miauw
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
paprka
f19f4d04b1 typo fix 2014-12-08 01:33:44 -08:00
paprka
837e42fb3f last minute changes to the uplink 2014-12-07 23:27:45 -08:00
paprka
5b6039a521 changes to the uplink and further c90 updates 2014-12-07 19:39:24 -08:00
tkdrg
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
paprka
9e9b8b440d adds winter coats and changes labcoat toggling 2014-12-04 21:29:21 -08:00
paprka
2425903320 intial commit, renames stechkin 2014-12-04 18:13:50 -08:00
phil235
7d9c9bd5fc Fixing fake_gbs, gbs, magnitis and maybe other diseases not being curable. 2014-11-28 22:31:04 +01:00
hornygranny
bc7a7a7452 Merge pull request #6084 from tkdrg/hudindahood
Fixes data/antag HUD bugs
2014-11-27 13:50:34 -08:00
tkdrg
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
hornygranny
64777be5d5 Merge pull request #6070 from Razharas/VirShit
Final fix for viruses not working
2014-11-26 13:32:29 -08:00
Cheridan
096a7c3770 Merge pull request #6013 from tkdrg/dropthesoap
Fixes wizard slipping on all the area soaps
2014-11-26 11:36:31 -06:00
Razharas
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
hornygranny
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
tkdrg
e38d787c97 Fixes roundstart runtime involving HUDs 2014-11-24 22:22:58 -03:00
hornygranny
3d01e77dba Merge pull request #5998 from Razharas/SpellRun
Fixes disabilities spell runtime
2014-11-23 15:34:22 -08:00
Cheridan
51b6253315 Merge pull request #5964 from phil235/ViroFix1
Fixing viruses not working.
2014-11-23 00:56:29 -06:00
tkdrg
063a19c814 Fixes wizard slipping on all the area soaps 2014-11-22 19:24:57 -03:00
phil235
3a97e8d878 Fixes not being able to have more than one virus. (two typos fixed) 2014-11-22 18:30:19 +01:00
Razharas
f18b5f9f43 Fixes disabilities spell runtime
Fix #5671
2014-11-22 20:19:53 +03:00
Razharas
faa1dfc09e Merge pull request #5943 from MrPerson/forcewall_when_stunned
Allow casting conjuration spells like forcewall when stunned.
2014-11-22 16:03:30 +03:00
phil235
3d540a0d03 Fixes missing cure_text's, fixes virus being uncurable, fixes advance virus changing upon injection. Fixes virus staying at stage 1. 2014-11-20 20:36:43 +01:00
tkdrg
3bb478f12f Includes antag HUDs in the datum hud overhaul
Makes hud_list associative, and introduces the /atom list hud_possible,
which lists all the possible hud images a certain atom can provide.

Replaces all the awful procs in the gamemodes with their new
/datum/atom_hud versions, which are much shorter, simpler and faster.
2014-11-20 15:43:51 -03:00
Cheridan
283cd657fe Merge pull request #5955 from Jordie0608/ideletedmyvdibyaccident
Fixes #5951 Uplink implant TC amount description
2014-11-20 08:55:15 -06:00
Jordie
48b60c82a1 Corrects uplink implant desc tc amount 2014-11-19 19:46:06 +11:00
Cheridan
1208c48af3 Merge pull request #5652 from Menshin/atmos_z_level_fix
Atmos z level fix + radio controller code sanitization
2014-11-18 17:05:14 -06:00
MrPerson
6c5bb53df0 Allow casting conjuration spells like forcewall when stunned.
Fixes #4937
2014-11-17 21:21:01 -08:00