tkdrg
84e3eaaf16
Merge pull request #6676 from Jordie0608/beeverycarefulwiththese
...
Adds bee and butterfly disease to virus pack
2015-01-02 02:33:23 -03:00
Jordie0608
fd71b7cbb2
Adds bee and butterfly disease to virus pack
2014-12-30 14:44:30 +11:00
Razharas
37a7fa2414
Fixes that one runtime with tourettes
...
Animation proc is magic, dont ask dont tell
2014-12-29 16:56:02 +03:00
Razharas
418e3a0613
General cleanup
...
Fixed the magic text failing in monkey injectors
Removed lots of comments
Didnt fix mysterious list bounds runtime in tourettes
2014-12-29 11:36:01 +03:00
Razharas
76a21883a8
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
...
Conflicts:
code/game/mecha/mecha.dm
code/game/objects/structures/tables_racks.dm
code/modules/mob/living/silicon/silicon.dm
code/modules/projectiles/gun.dm
Fixes dem conflicts
2014-12-28 11:20:15 +03:00
Razharas
208b59c30e
Fixed stuff tkdrg pointed out
...
Added comment to dualsaber and hulk checks to explain whats going on
Added defines that converts to mutation names
Fixed grammer again
2014-12-28 10:49:04 +03:00
tkdrg
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
paprka
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
phil235
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
paprka
c75c6e493a
removes broken tactical helmets crate
2014-12-25 18:10:10 -08:00
Menshin
cf41dab26f
Conflict fixing
2014-12-25 22:34:40 +01:00
paprka
595ad8df58
fixed compile errors
2014-12-24 21:03:22 -08:00
Swag McYolosteinen
495604228c
Merge pull request #6455 from paprka/bayports
...
Ports manifest / better ready button(s)
2014-12-24 11:54:40 +01:00
paprka
73f5d8db9c
fixes bugs
2014-12-23 12:07:32 -08:00
Razharas
57b41dce0d
Fixed some shiet
...
Redone how injectors handle mutations(now it doesnt copy the SE but
manipulates mutations directly)
Removed sole leftovers
Fixed humanizing
Fixed grammer
2014-12-21 08:19:23 +03:00
Razharas
9a27fe7c8d
Conflict fix
...
Yeah makes it all work
2014-12-21 06:12:33 +03:00
Cheridan
c9c14feec6
Merge pull request #6411 from wild-billy/master
...
Reserve PascalCase inits
2014-12-18 02:30:08 -06:00
paprka
adc09ffe41
initial commit for bay ports
2014-12-17 23:42:09 -08: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
Razharas
f0c8f2eeac
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
...
Conflicts:
code/modules/reagents/Chemistry-Reagents.dm
conflicts resolution
2014-12-16 02:52:08 +03:00
Razharas
570783d2c7
Added comments for RR for future
2014-12-16 02:35:54 +03: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
21a2c2d21e
Made clumsiness into disability
...
I really dont want to make clumsy_act()
2014-12-14 08:04:48 +03:00
Razharas
bafef911d4
Merge pull request #6317 from paprka/saltyfuckingcuntm8
...
Security aesthetic overhaul
2014-12-14 07:57:33 +03:00
Razharas
8610725968
Monkifying change and some mutations fixes
...
It approaches playable level of working, hurray!
2014-12-14 03:04:23 +03:00
Menshin
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
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
Razharas
8d110ee496
Tiny clean up, still lots of work to do
...
Only compiletested, these changes were never tested in the game yet
2014-12-12 23:57:11 +03: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
Razharas
11f6c7c401
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
2014-12-12 04:51:16 +03:00
Razharas
0921aa201f
Added datum mutations
...
Also removed some mob vars like sdisabilities and merged the usability
with disabilities
Removed need for mutations var, they are not handled in dna
Removed blinded var, now its handled by eye_blind being bigger than zero
Ands lots, lots of other shit in files that used mutations
2014-12-12 04:48:11 +03: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
