HarpyEagle
ffc50c3cfa
Fixes #11321
2015-10-17 20:53:03 -04:00
Cael Aislinn
105792686a
resprites xenoarch items (guns, eguns and other small stuff) and some large artifacts by skowron, reworks preset triggers to be a little more predictable for specific large artifact groups
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2015-10-17 02:02:55 +10:00
Hubblenaut
cbd0972bfa
Bruise packs are used per wound and take time to apply
2015-10-16 16:36:04 +02:00
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
Snapshot
d75a146cc3
Merge pull request #11306 from mwerezak/sunglasses-loadout
...
Fixes #11216
2015-10-15 07:47:21 -07: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
HarpyEagle
e24313be2e
Fix macro
2015-10-15 07:02:57 -04:00
mwerezak
7272deb5ae
Fixes #11216
...
Sunglass-derived custom gear is now only available to roles that normally have access to them.
2015-10-15 06:58:25 -04:00
mwerezak
27fe99bdf0
Reagent transfer now checks simulated var
2015-10-15 06:46:07 -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
mwerezak
d260b3bb18
Fixes #11300
...
Atoms crossing a smoke cloud now get splashed with up to 10 units of reagent.
2015-10-15 06:44:21 -04:00
mwerezak
dcde34512c
Refactors pepperspray touch effect, adjusts pepperspray messages.
2015-10-15 06:42:08 -04:00
PsiOmegaDelta
2fcaaf80c7
Chemistry machinery fixes.
...
Makes Topic() calls check parent. Adds proper operable() checks where applicable.
Makes the interact_offline only affect the NOPOWER flag.
Fixes #11116 . Fixes #11302 .
2015-10-15 11:31:57 +02:00
mwerezak
27429f7b0c
Less copypasta
2015-10-15 01:59:04 -04:00
Datraen
39d384cbe4
Makes Deckard's gun usable.
2015-10-14 19:05:14 -04:00
Mike
4db9677c88
Fixes pepperspray confusion
...
Eye protection now prevents blindness, face protection prevents stun, instead of face protection doing both.
2015-10-14 14:49:52 -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
Chinsky
8c8b5a34d3
Merge pull request #11288 from PsiOmegaDelta/151310-RandomBlob
...
Blob spawn locations are now more random
2015-10-14 03:24:28 +03: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
PsiOmegaDelta
3b5990121f
Blobs locations are now more random.
...
Blobs now randomly pick a random turf without obstructions in maintenance, instead of from a pre-determined list of locations.
Blobs also now log their spawn location, which admins can use to jump to it.
Space vines and nuclear discs have been updated to use the same mechanics.
2015-10-13 18:49:55 +02:00
Zuhayr
608c766db2
Merge pull request #11279 from PsiOmegaDelta/151012-Ghostize
...
ghostize() now attempts to set the most relevant time of death.
2015-10-13 08:36:28 +10:30
Zuhayr
5dc6ff5da1
Merge pull request #11230 from PsiOmegaDelta/xenomorphs
...
Xenomorph update
2015-10-13 08:31:27 +10:30
HarpyEagle
241520f0bb
Cleans up autospawn, now uses existing code for selecting and choosing
...
candidates. Adds more debug messages, and removes unused code.
2015-10-12 13:03:50 -04:00
mwerezak
46f5bbc1d4
Merge pull request #11277 from Hubblenaut/stacks
...
Fixes stack creation logic and return value
2015-10-12 11:25:51 -04:00
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
GinjaNinja32
de68e366f5
Merge pull request #11270 from Hubblenaut/master
...
Flavor Text Bugfix
2015-10-11 23:55:10 +01:00
Hubblenaut
1c8ec1a700
Fixes stack creation logic and return value
2015-10-11 22:02:05 +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
PsiOmegaDelta
38c6ba3a07
Code relocation.
2015-10-11 17:31:21 +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
Neerti
7571ba8c4b
Think I'm done.
2015-10-11 01:16:25 -04: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
24d9545790
Headset/shield issues.
2015-10-11 00:54:01 -04:00
Mark9013100
ce4b21550a
Edits the Z8, L6, and A12
...
Conflicts:
code/modules/projectiles/guns/projectile/automatic.dm
2015-10-11 00:44:47 -04:00
Mark9013100
0714ce3f93
Update automatic.dm
2015-10-11 00:44:22 -04:00
Mark9013100
fa361890ff
Minor change to the auto shotgun and SAW
...
Conflicts:
code/modules/projectiles/guns/projectile/automatic.dm
icons/obj/rig_modules.dmi
2015-10-11 00:44:18 -04:00
Mark9013100
488ebc89b2
Balances fm-t2, nerfs burstfire
...
Conflicts:
code/modules/projectiles/guns/projectile/automatic.dm
2015-10-11 00:42:26 -04:00
Mark9013100
1273a51f83
Merges f-card box and evidence bag box
...
Conflicts:
code/game/objects/items/weapons/storage/boxes.dm
2015-10-11 00:41:46 -04:00
Mark9013100
080e526e9e
Fixes an issue with helmet visors
2015-10-11 00:40:11 -04:00
Mark9013100
fb1134a24b
Changes several helmets, fixes shields
...
Conflicts:
code/game/objects/items/devices/radio/headset.dm
code/game/objects/items/weapons/shields.dm
code/modules/clothing/head/helmet.dm
icons/mob/head.dmi
icons/obj/clothing/hats.dmi
2015-10-11 00:39:38 -04:00
SinTwo
4129b95f4e
TG_PORT_fix 2
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/secure/security.dm
code/modules/clothing/suits/miscellaneous.dm
2015-10-11 00:36:50 -04:00
