10695c16b0
fixes everything, updates jitter amount
2014-12-15 01:00:53 -08:00
1fd9e6bfda
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
...
Conflicts:
icons/obj/gun.dmi
2014-12-14 21:55:28 -08:00
ddfac78cf2
initial commit for adding jitteriness for electrodes
2014-12-14 21:47:29 -08:00
b67043f267
Merge pull request #6329 from phil235/HungerChange
...
Hunger change
2014-12-14 12:55:21 -06:00
dc654e74db
Removes white ian undershirt
...
As requested by the head coders. Too many ian shirts.
2014-12-14 15:21:28 -03:00
abe866f2d0
Fixes two runtimes
...
Related to issue #6351
Fixes facehuggers checking oreboxes for stat.
Fixes monkeys dropping HUDs runtime.
2014-12-14 14:40:14 -03:00
7ff196a67d
Fixes Slimes attacking slime people.
2014-12-14 16:31:28 +01:00
8ab1a60779
Lowers stun duration to compensate animation
2014-12-14 10:12:08 -05:00
363e91a240
Adds a brief stutter to shocking.
2014-12-14 10:09:36 -05:00
b983176937
Merge remote-tracking branch 'upstream/master' into fashionandfashionaccesories
...
Conflicts:
icons/mob/uniform.dmi
icons/obj/clothing/uniforms.dmi
2014-12-14 11:59:45 -03:00
0b26a71a71
Merge pull request #6333 from tkdrg/singulobj
...
The singularity/narsie are no longer machines
2014-12-14 10:02:39 +03:00
303564638b
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
code/game/jobs/job/security.dm
2014-12-13 22:58:22 -08:00
db6eabfc4e
intial commit for syndicate hardsuit feature
2014-12-13 22:26:09 -08:00
f9ea923c8b
Adds shocking animations
2014-12-13 23:04:08 -05:00
44cc6c6d97
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
2014-12-14 03:07:13 +03:00
8610725968
Monkifying change and some mutations fixes
...
It approaches playable level of working, hurray!
2014-12-14 03:04:23 +03: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
79e8ad4142
The singularity/narsie are no longer machines
2014-12-12 19:42:37 -03:00
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
f9dff2f626
Balancing nutrition and fixing some nutrition stuff that I had missed.
2014-12-12 13:59:31 +01:00
11f6c7c401
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
2014-12-12 04:51:16 +03:00
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
98a865298a
Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor
...
Conflicts:
code/game/mecha/mech_fabricator.dm
2014-12-11 13:53:37 -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
05f5a1223d
Merge pull request #6131 from paprka/injurydoll
...
Health doll, UI improvements
2014-12-11 12:42:06 -06:00
3ede77face
Merge pull request #6189 from Menshin/exofab_revamp_end+fixes
...
Exofab revamp finishing and fixes
2014-12-11 11:52:16 -06:00
91d6fb38b9
Merge pull request #6245 from tkdrg/hudwhyyoudothistome
...
/datum/atom_hud (Passive HUDs) bugfixes
2014-12-11 08:39:12 -06:00
dc01a092af
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
...
Conflicts:
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/obj/gun.dmi
2014-12-10 23:55:51 -08:00
e3016f582d
Merge pull request #5956 from RemieRichards/SpaceNooneHearScreams
...
In space, no one can hear you scream
2014-12-10 17:43:32 -06:00
e53f8294d7
initial commit for nerfing ranged stuns
2014-12-10 00:16:53 -08:00
8175bd91e0
Mining sound revamp, using realistic sounds now instead of reusing sound. Plus improved Taser sound.
2014-12-09 19:38:49 -08:00
72132b1bf1
fixes whitespace
2014-12-09 16:32:16 -08:00
af3f1aa4d8
Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor
...
Conflicts:
code/game/machinery/deployable.dm
code/game/objects/items/weapons/storage/lockbox.dm
code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
code/modules/clothing/glasses/hud.dm
code/modules/mob/living/silicon/robot/robot.dm
2014-12-09 16:03:45 -08:00
347e7ecf9d
Merge pull request #6135 from Menshin/species_radiation_processing_fix
...
Fixes radiation levels processing for aliens, brains and monkeys
2014-12-09 09:31:31 -06:00
a7c2b14d83
Merge pull request #6159 from optimumtact/halfthecake
...
Removed nearly all move penalties while in space
2014-12-09 08:46:54 -06:00
c9700d6b12
-Attempting to make mobs less laggy in the event many hostile mobs are spawned near each other by narrowing their searching by default with a new var, removes ishuman check
...
-Humans create a unique faction on creation, and transfer it via cloning/replica podding etc
-Created slime faction, gives slime and slime men that faction
-Simultaneous goliath tentacling will no longer stack, and goliaths now have a "tell" when they're about to strike
2014-12-09 02:05:34 -08:00
cc8c221fab
Merge pull request #6257 from as334/Slimes
...
Add's more stuff for Xenobiology and slimes
2014-12-09 06:44:12 +03:00
d61ecfa324
Merge pull request #6181 from GunHog/Autosay_Fix
...
Lets AI and Borgs control radio behavior for auto announcements.
2014-12-09 01:16:48 +03:00
b9531ad5e7
[r] -> [radiomod]
...
Just changes instances of [r] to [radiomod]. No functional changes.
2014-12-08 15:40:45 -06:00
4237c406e4
Merge branch 'master' of https://github.com/tgstation/-tg-station into fashionandfashionaccesories
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
2014-12-08 13:53:31 -03: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
b23a9b1299
Work on mobs and factions
2014-12-08 07:21:06 -08:00
b828448645
Merge pull request #6228 from paprka/coatscoats
...
Adds winter coats and changes labcoat toggling
2014-12-08 11:35:56 +01:00
bff2e62a0f
Merge pull request #6175 from Razharas/ExActFix
...
Fixes ex_act() destroying too much shit
2014-12-08 08:03:35 +01:00
766780ca98
Testing if git has unfucked.
2014-12-07 22:17:41 -05:00
f3e2c2d1f9
Add's feedback, changes plasma usage.
2014-12-07 21:35:52 -05:00
5a78aa83be
Merge pull request #6225 from NecroticBinder/Clean_Slime_Fix
...
Clean slime fix
2014-12-08 04:31:58 +03:00
f21e9d0a6b
Adds neat slime stuff
2014-12-07 16:20:31 -05:00
944a73b569
Establishing Goliath pre-attack behaviors
2014-12-07 04:57:59 -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
paprka
Cheridan
tkdrg
phil235
Xhuis
Razharas
Razharas
Hornygranny
Cuboos
Ergovisavi
GunHog
Swag McYolosteinen
as334