Atlantis
a70ec21e64
Fixes #11276
...
- Re-adjusts two values to take new lighting in account.
- For reference. Turf which has light fixture (large) on it, has light value of 6. An average half-lit turf has around 1.5. These values were obtained via in-game tests.
- Using old values, diona would die (without another light source such as flashlight) when standing on any other turf other than turf with light fixture.
- Now it should be relatively similar to the old values before lighting changes.
2015-10-16 14:17:47 +02:00
PsiOmegaDelta
299ad9580c
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/admin/admin.dm
code/modules/admin/topic.dm
2015-10-16 13:02:59 +02:00
PsiOmegaDelta
fc4c1d6af7
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/storage/boxes.dm
code/game/objects/items/weapons/storage/storage.dm
2015-10-16 11:04:43 +02:00
ccomp5950
111973ed5c
AI's can now use languages through holopads...
...
...and have it respect if the listener understands.
Resolves #11113 (AI's speech not timestamped through holopad)
Resolves #11183 (All languages can be understood when AI speaks them through a holopad.)
Resolves #6217 (pAIs cannot hear AI hologram speech)
2015-10-15 19:56:45 -04:00
Chinsky
0c474bc5a5
Merge pull request #11281 from mwerezak/autoantag
...
Cleans up antag auto-spawning, adds checks for active antags
2015-10-15 19:16:13 +03:00
Chinsky
2a88b4d0aa
Merge pull request #11219 from PsiOmegaDelta/150929-HumanoidVision
...
Overhauls humanoid vision handling.
2015-10-15 19:15:28 +03:00
mwerezak
07881e7495
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into attack-cleanup2
...
Conflicts:
code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
2015-10-15 07:08:16 -04:00
mwerezak
41e8798516
Adjusts chemsmoke breathing
...
Inhaled reagents are now split between bloodstream and ingestion.
Reagents are not inhaled if environment pressure is too low.
2015-10-15 06:45:22 -04:00
PsiOmegaDelta
3fd28dd361
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
html/changelogs/.all_changelog.yml
2015-10-14 08:41:38 +02:00
PsiOmegaDelta
3fd172ee63
Merge pull request #11294 from Baystation12/master
...
Dev-freeze
2015-10-14 08:40:03 +02:00
PsiOmegaDelta
d7b6784e28
Fixes law change logging.
...
The "Show last X law changes" review window should now actually be useful, displaying AI law updates with time, user, and law change.
2015-10-13 19:44:49 +02:00
Zuhayr
5dc6ff5da1
Merge pull request #11230 from PsiOmegaDelta/xenomorphs
...
Xenomorph update
2015-10-13 08:31:27 +10:30
Kelenius
741cb2d423
It was bork, I made it not bork
2015-10-12 13:57:47 +03:00
PsiOmegaDelta
7247906f41
ghostize() now attempts to set the most relevant time of death.
...
ghostize() now only uses the mob's time of death if the mob is actually dead, otherwise uses the current time. Fixes #11229 .
2015-10-12 12:55:34 +02:00
HarpyEagle
43d5f2e3bd
Ensures leftover candidates and pending antags are cleared after finalizing
2015-10-11 11:39:26 -04:00
PsiOmegaDelta
27feb09a31
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/computer/computer.dm
html/changelogs/.all_changelog.yml
2015-10-11 17:37:01 +02:00
HarpyEagle
dec0629fae
Renames latespawn() to be less confusing
2015-10-11 11:26:24 -04:00
PsiOmegaDelta
070ca0adea
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/tanks/tanks.dm
code/modules/holodeck/HolodeckControl.dm
code/modules/mob/living/carbon/breathe.dm
code/modules/mob/living/carbon/human/life.dm
code/setup.dm
2015-10-11 17:17:41 +02:00
SinTwo
ec58f7c705
TG_Port
...
Conflicts:
code/game/objects/items/devices/radio/headset.dm
code/game/objects/items/weapons/shields.dm
code/game/objects/items/weapons/storage/backpack.dm
code/modules/clothing/head/helmet.dm
code/modules/clothing/suits/miscellaneous.dm
code/modules/clothing/under/accessories/accessory.dm
code/modules/mob/new_player/sprite_accessories.dm
icons/mob/back.dmi
icons/mob/head.dmi
icons/mob/mask.dmi
icons/obj/clothing/hats.dmi
polaris.dme
2015-10-11 00:58:26 -04:00
Neerti
bbe8c336b2
Adds socks.
...
Conflicts:
code/modules/client/preferences_savefile.dm
2015-10-11 00:13:33 -04:00
Neerti
e52a0ea332
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015
...
Conflicts:
.travis.yml
code/game/gamemodes/changeling/changeling_powers.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/turfs/simulated.dm
code/global.dm
icons/misc/fullscreen.dmi
polaris.dme
2015-10-10 23:17:26 -04:00
Hubblenaut
d3572bf4cb
Fixes empty flavor text drawing two spaces
2015-10-10 15:55:25 +02:00
PsiOmegaDelta
13b175c529
Merge remote-tracking branch 'upstream/dev' into xenomorphs
...
Conflicts:
code/game/objects/effects/aliens.dm
code/game/objects/structures/lamarr_cage.dm
2015-10-10 12:05:36 +02:00
HarpyEagle
5684befee2
Fixes #11262
2015-10-09 18:57:17 -04:00
PsiOmegaDelta
8341620be4
Merge pull request #11246 from Kelenius/blobPlzGo
...
Updates blob
2015-10-08 07:58:15 +02:00
PsiOmegaDelta
55c9f7533b
Alien eggs now include follow and spawn links. The alien larvae plant seed check now uses the specific type instead of a name.
2015-10-07 08:56:13 +02:00
PsiOmegaDelta
aaba2c5c8c
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/silicon/robot/robot_modules.dm
2015-10-07 08:14:30 +02:00
PsiOmegaDelta
c5d8fbfd57
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/antagonist/alien/borer.dm
code/modules/mob/living/living_defense.dm
2015-10-07 08:07:23 +02:00
Chinsky
8107786cbd
Merge pull request #11245 from PsiOmegaDelta/151005-RobustRoboticsSpeech
...
Makes silicon language handling more robust.
2015-10-06 19:32:54 +03:00
PsiOmegaDelta
019c147bdc
HUD element positioning.
...
HUD positions are now relative the client view screen edges instead of absolute.
We don't currently use custom client view ranges, but this potentially makes it more reasonable to implement (an example is a new short sighted species of ours).
Port of https://github.com/d3athrow/vgstation13/pull/5984 .
2015-10-06 12:51:03 +02:00
HarpyEagle
74950268d7
Fixes fire_stacks update logic
2015-10-05 19:24:33 -04:00
HarpyEagle
7f066065d3
Merge remote-tracking branch 'upstream/dev' into attack-cleanup2
...
Conflicts:
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
code/modules/mob/living/simple_animal/simple_animal.dm
2015-10-05 19:20:33 -04:00
Kelenius
83adba88d4
Updates blob
...
Remains of player blob axed.
blob_act() axed. Blob now has an arbitary set of things it can attack.
It will flow over everything else. Blob has an awful tendency to destroy
non-craftables.
Will test more tomorrow.
Blob will now attack mechs.
Fixes #8106 .
Fixes #10705 .
2015-10-05 18:10:16 +03:00
PsiOmegaDelta
bbcadcc080
Makes silicon language handling more robust.
...
Also fixes an issue with lists being targets for qdel(). Fixes #11221 .
2015-10-05 11:21:09 +02:00
PsiOmegaDelta
f3175becc0
Overhauls humanoid vision handling.
...
Clothes now have a flash protection and tint level. If one is wearing multiple items with these modifiers they do stack.
Glasses also have a number of additional additions such as sight flags, see_invis level, and so forth.
Flash protection comes in 4 levels: Reduced, none, moderate, major.
Reduced protection, for example, means the user takes increased damaged from welding.
Moderate protection safeguards mobs from flashes, flash grenades, projectors, etc.
Major protection protects from the above as well as welding.
Tint also comes in 4 levels: None, moderate, heavy, blind
Moderate tint will apply the nearsighted overlay.
Major tint will apply the welding overlay.
Blind will apply the blindness overlay.
The end result is an attempt of less type checking. Any set of glasses may now also contain HUD glasses.
This should make a future rewrite of HUD glasses easier (could have the HUD functionality be a datum rather than separate item).
2015-10-05 08:48:47 +02:00
PsiOmegaDelta
a3a1f495a3
Implements my own comment suggestions and updates Travis' macro count.
2015-10-01 09:56:30 +02:00
PsiOmegaDelta
8eee143177
Merge remote-tracking branch 'upstream/dev' into xenomorphs
...
Conflicts:
baystation12.dme
2015-10-01 09:48:51 +02:00
PsiOmegaDelta
357c716a2b
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-29 11:52:48 +02:00
PsiOmegaDelta
597631687b
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-09-29 11:26:42 +02:00
PsiOmegaDelta
d77bcd7937
The silicon law manager now only requires the host to be conscious.
...
This should mean that the law manager is available even for carded AIs, even with the wireless interface disabled. Fixes #11139 .
2015-09-28 21:23:10 +02:00
PsiOmega
e0951b1cf9
has_admin_rights() improvement.
...
Now calls the check_rights() proc, which handles all checks for us.
2015-09-27 17:05:15 +02:00
PsiOmega
63de1764c3
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-27 13:48:33 +02:00
PsiOmega
807e7bf954
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/spells/artifacts.dm
2015-09-27 13:36:56 +02:00
HarpyEagle
380b89fcc0
Fixes #11130 , renames aghosted var
...
because it is no longer used solely for aghosting.
2015-09-26 20:48:13 -05:00
mwerezak
03cb79a85d
Merge pull request #11187 from PsiOmegaDelta/150925-Destruction
...
Destroy tweaks.
2015-09-26 20:22:01 -05:00
mwerezak
21f679ea8f
Merge pull request #11191 from PsiOmegaDelta/150925-RadioActivity
...
Makes more sources of radiation respect rad-protection.
2015-09-26 20:10:47 -05:00
PsiOmega
a3b9ab1236
Makes internal radiation sources also use apply_effect(), by utilizing the ability to ignore radiation protection.
2015-09-26 09:19:58 +02:00
PsiOmegaDelta
9dd1a54191
Destroy tweaks.
...
Ports Destroy() proc tweaks from Paradise and /tg/, sourced from https://github.com/ParadiseSS13/Paradise/pull/2091 .
Adds returns in Destroy()s, to prepare for future return values.
2015-09-25 10:44:23 +02:00
Hubblenaut
8d3519e24b
Belt layer below suit layer, belts toggleable
2015-09-24 17:48:14 +02:00
Zuhayr
d37bf5fe2f
Updating to new dev antagonist code.
2015-09-21 20:38:19 +09:30