Neerti
dd3ab4dac0
Finishes new ling, need better sprites but that's for another time.
2015-11-18 16:20:28 -05:00
Neerti
4f77afece1
Revert 58ef59734f
2015-11-08 10:09:14 -05:00
Neerti
45f15930a0
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge
...
Conflicts:
.travis.yml
code/_helpers/lists.dm
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
code/global.dm
code/modules/client/preferences.dm
code/modules/client/preferences_savefile.dm
code/modules/reagents/dispenser/dispenser2.dm
polaris.dme
2015-11-06 17:41:18 -05:00
PsiOmegaDelta
19051ec27e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-11-02 09:25:04 +01:00
PsiOmegaDelta
694a35c10b
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-11-02 09:08:06 +01:00
Chinsky
ba3c1f03d7
Merge pull request #11195 from Hubblenaut/dev
...
CtrlClick deflates inflatables
2015-11-02 00:11:14 +03:00
Chinsky
1417f4f40b
Merge pull request #11344 from Hubblenaut/tape
...
Tape - Sprites and Algorithm Changes
2015-11-02 00:10:03 +03:00
Chinsky
4ae1a45017
Merge pull request #11389 from PsiOmegaDelta/152710-MagicCrescentWindows
...
Crescent windows are now near indestructible.
2015-11-02 00:08:52 +03:00
PsiOmegaDelta
a9f7b3a325
Merge pull request #11247 from Hubblenaut/laundry
...
Adds laundry basket
2015-10-31 11:16:14 +01:00
Neerti
865f4b1d38
Revert "Comments out clothing coverage."
2015-10-31 04:15:36 -04:00
Mark9013100
61f9608324
Comments out clothing coverage.
...
Comments out the slot_is_accessible flag.
2015-10-30 13:45:43 -04:00
PsiOmegaDelta
ab2ddfcba7
Atmospheric computer circuit additions.
...
Adds several missing variables used in the construction and deconstruction set of gas management computers. Fixes #11392 .
Computers also no longer attemps to qdel a type on Destroy()
2015-10-29 16:55:58 +01:00
PsiOmegaDelta
7c7ed0f3fc
Crescent windows are now indestructible.
2015-10-28 09:25:12 +01:00
PsiOmegaDelta
9d6c99aaf3
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
.travis.yml
code/modules/mob/living/carbon/breathe.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
html/changelogs/.all_changelog.yml
2015-10-27 13:08:33 +01:00
PsiOmegaDelta
3db2c4fb49
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
2015-10-27 12:38:28 +01:00
Mark9013100
9b9bcff9de
Brings back the Ausop helmets added in one of my earlier PRs.
...
Brings back the telescopic shield sprite for the back.
And, as an act of ultimate buuuullshit, a corporate detective uniform, with a detective wardrobe(neither of them are mapped in right now).
2015-10-26 21:02:16 -04:00
Chinsky
35ce07aa71
Merge pull request #11296 from mwerezak/pepperspray-fix
...
Pepperspray and chem smoke fixes
2015-10-26 05:42:59 +03:00
PsiOmegaDelta
e37394e8fa
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/human/human_helpers.dm
code/modules/reagents/reagent_containers/food/snacks.dm
2015-10-25 20:28:48 +01:00
PsiOmegaDelta
7d4f51be8e
Merge pull request #10287 from mwerezak/attack-cleanup2
...
Refactors item attack click and mob melee attack handling code
2015-10-25 08:43:47 +01:00
PsiOmegaDelta
d845a2f587
Generalizes the feed and force feed checks.
2015-10-23 10:57:55 +02:00
PsiOmegaDelta
8305404a14
Can no longer use utensils to eat if you lack the means.
...
Humanoid mobs can no longer eat when missing a mouth or when their mouth is blocked when using utensils, same as when eating food directly.
Fixes #11333 .
2015-10-22 16:52:07 +02:00
Hubblenaut
ef591fa2b3
Atmos personal locker spawn with atmos tape roll
2015-10-22 14:31:07 +02:00
Hubblenaut
8f921682a0
Police tape rewrite
2015-10-22 14:31:04 +02:00
PsiOmegaDelta
55f6c1c0b5
Merge pull request #11204 from Hubblenaut/medical
...
Bruise Packs, Changes and small Fixes
2015-10-19 16:17:16 +02:00
mwerezak
47ace5ed3e
Chem smoke refactor
2015-10-18 11:54:17 -04:00
Hubblenaut
cbd0972bfa
Bruise packs are used per wound and take time to apply
2015-10-16 16:36:04 +02:00
PsiOmegaDelta
0c3b6c01e2
Radio NanoUI.
...
Ports the radio NanoUI interface from Paradise with some Bay-adjustments.
Based on the latest revision https://github.com/ParadiseSS13/Paradise/pull/2369 .
2015-10-16 16:01:36 +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
bb93245ccd
Fixes the tapping messages check.
...
The check is now in Topic() instead of being based on the href link sent.
Resolves #11039
2015-10-15 21:11:06 -04:00
mwerezak
e8d6772523
Smoke clouds dissipate faster in low pressure
2015-10-15 16:53:06 -04: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
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
PsiOmegaDelta
e79e82f55d
Gives replacement light boxes the same fitness treatment.
2015-10-15 10:42:51 +02:00
PsiOmegaDelta
fd03e4d59b
Surgical kits can now contain their equipment.
...
The surgical kit can now contain the equipment it came with. It can also not contain more items of a given type than it was spawned with.
This means that even if the storage container otherwise has sufficient space it can, for example, still only ever contain 1 surgical saw.
Fixes #11298 . Fixes #11297 .
2015-10-15 10:20:49 +02: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
mwerezak
f245e41db2
Merge pull request #11287 from PsiOmegaDelta/151013-TopicFingerprints
...
Changes how Topic() calls apply fingerprints.
2015-10-13 22:11:26 -04: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
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
PsiOmegaDelta
cfc01d053b
Changes how Topic() calls apply fingerprints.
...
Now applies fingerprints if the user is adjacent to a physical object, otherwise applies a hidden fingerprint.
CouldUseTopic() is only called when a user has successfully interacted with an object interface/UI.
2015-10-13 08:56:20 +02:00
Zuhayr
5dc6ff5da1
Merge pull request #11230 from PsiOmegaDelta/xenomorphs
...
Xenomorph update
2015-10-13 08:31:27 +10:30
Hubblenaut
1c8ec1a700
Fixes stack creation logic and return value
2015-10-11 22:02:05 +02: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
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
24d9545790
Headset/shield issues.
2015-10-11 00:54:01 -04:00
Mark9013100
a2c8e3ee10
Minor edits to the sec lockers
...
Conflicts:
maps/colony-1.dmm
2015-10-11 00:45:22 -04:00
