28a23f7dae
Merge pull request #6506 from Menshin/silicons_motion_alarms_fix
...
Fixes AI motion alarms not properly clearing
2014-12-22 10:47:18 -08:00
c002d11ee7
Merge pull request #6476 from Cheridan/nightcrawler
...
Refactors snowflake AI hosting in ninja
2014-12-21 17:02:48 -08:00
4a142a0a6b
* Motions alarms will now properly clear for AI (and silicons)
...
* Some code cleaning
2014-12-21 13:29:51 +01:00
0600ad6948
Merge pull request #6462 from phil235/BearTrapRemovalFailMsg
...
Fixes handcuff/legcuff/beartrap removal fail message
2014-12-19 10:47:41 -08:00
25cc2999b0
Refactors snowflake AI hosting in ninja
...
why did i volunteer for this
It just has an integrated intellicard now. The gloves do the transferring.
Also Intellicards are all called Intellicards now and not Intelicards.
the ai_transfer proc is less awful but it's still
awful
awful awful awful
2014-12-18 21:03:09 -06:00
d44fa004b0
Merge branch 'master' into scarfs
...
Conflicts:
icons/obj/clothing/ties.dmi
2014-12-18 23:35:15 -03:00
eaec9a6e1b
9 more scarves and small corgi cleanup
...
Adds 9 more scarves (light blue, dark blue, orange, yellow, purple,
white, black, zebra and christmas).
Cleaned up corgi code a little bit, specially the parts involving icon
updates. Fixes a bug where adding a hat to a dead corgi didn't make you
drop your hat and created duplicate items. Makes corgis only use one
head/back mob sprite and rotate it appropriately. Call
regenerate_icons() only when needed now, instead of doing so every tick
on Life().
2014-12-18 23:09:49 -03:00
ca3df3b4a1
Fixes handcuff/legcuff/beartrap removal fail message appearing many seconds after the actual fail. It will now appear twice as fast.
...
Replacing two usr.
Fixing being able to remove both handcuff and legcuff by resisting once.
2014-12-18 17:42:42 +01:00
0976cde773
updates ian so he can use civillian armor instead of sec armor
2014-12-17 18:13:24 -08:00
4075e59e04
corporate security initial commit
2014-12-17 08:14:22 -08:00
0bb7d2a5a5
Merge remote-tracking branch 'remotes/upstream/master' into CuboosSoundS1E1
...
Conflicts:
code/game/objects/items/weapons/defib.dm
config/admins.txt
2014-12-15 18:12:14 -08:00
a9e3edbffe
Merge pull request #6359 from phil235/SlimeAttackSlimePeopleFIx
...
Fixes Slimes attacking slime people.
2014-12-15 16:26:26 -08:00
1519e320ee
Merge pull request #6357 from tkdrg/funtimes
...
Fixes two runtimes
2014-12-15 10:05:38 -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
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
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
f9dff2f626
Balancing nutrition and fixing some nutrition stuff that I had missed.
2014-12-12 13:59:31 +01: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
e3016f582d
Merge pull request #5956 from RemieRichards/SpaceNooneHearScreams
...
In space, no one can hear you scream
2014-12-10 17:43:32 -06: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
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
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
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
6fb548b283
Merge pull request #6220 from MrPerson/yet_another_attempt_at_fixing_this_shit
...
Fixes mobs getting moved on the escape pods when buckled
2014-12-06 07:42:12 +03:00
7758a0afed
Ok now explosions shall work properly
...
Changed severity to target, make items not destroy themselves on
severity lower than 1, all that stuff
2014-12-05 23:21:48 +03:00
6ce052f45a
Merge branch 'master' of https://github.com/tgstation/-tg-station into ExActFix
2014-12-05 20:45:27 +03:00
9e9b8b440d
adds winter coats and changes labcoat toggling
2014-12-04 21:29:21 -08:00
acd956179b
Merge remote-tracking branch 'upstream/master' into fashionandfashionaccesories
...
Conflicts:
_maps/map_files/tgstation.2.1.3.dmm
2014-12-04 20:47:29 -03:00
hornygranny
MrPerson
Menshin
Cheridan
tkdrg
phil235
paprka
Cuboos
Cheridan
Razharas
GunHog
Swag McYolosteinen
as334
Razharas