PsiOmegaDelta
7d975aa36f
Map tweaks.
...
Adds a couple of decals to the Thunderdome.
Rotates sleepers/scanners on z-level 1 and 2. Had already done so for z-level 5. Fixes #11058 .
Full tile windows no longer appear to exist? Replaces the glass on the toxin test site with reinforced glass spawners.
2015-09-20 17:59:57 +02:00
PsiOmegaDelta
a7fa8cde49
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/clothing/spacesuits/void/merc.dm
code/modules/mob/living/living.dm
code/modules/mob/living/simple_animal/borer/borer_captive.dm
code/modules/mob/mob_grab_specials.dm
code/modules/reagents/reagent_containers/food/drinks/bottle.dm
html/changelogs/.all_changelog.yml
2015-09-11 08:54:03 +02:00
PsiOmegaDelta
0b433eb90c
Code relocation.
2015-09-11 08:45:49 +02:00
PsiOmegaDelta
f81ac77884
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mining/abandonedcrates.dm
code/modules/mob/living/silicon/ai/ai.dm
2015-09-11 08:38:28 +02:00
Vivalas
ae5810d6ed
Fixes #10729
2015-09-10 13:50:24 -05:00
mwerezak
f69c723d40
Made flares a bit brighter
2015-09-09 20:42:40 -04:00
PsiOmegaDelta
cbd621ae41
Merge remote-tracking branch 'upstream/dev' into 150907-UplinkUses
2015-09-09 08:18:26 +02:00
PsiOmegaDelta
6a956d0d0a
Uplink fixes.
...
Adds a default welcome message. Was lost in a game mode cleanup.
Traitors should now have telecrystals again. Also lost in the game mode cleanup.
Uplinks without correctly defined owners are now also printed in the round end summary.
2015-09-08 08:43:40 +02:00
PsiOmegaDelta
94b4c483ba
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-08 08:22:37 +02:00
PsiOmegaDelta
ec7e2491be
Updates "on merge" entries. Relocates code.
2015-09-08 08:03:14 +02:00
PsiOmega
0e2f44e3ac
Admin logs bought uplink items.
2015-09-07 20:02:43 +02:00
Zuhayr
0c56bdd448
Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs
...
Makes it possible to define multiple tag pairs for the Travis check.
2015-09-07 13:57:09 +09:30
Zuhayr
fca95039bf
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
code/game/gamemodes/intercept_report.dm
code/game/gamemodes/traitor/traitor.dm
code/global.dm
code/modules/mob/inventory.dm
code/modules/mob/living/living.dm
html/changelogs/.all_changelog.yml
2015-09-07 11:31:19 +09:30
Zuhayr
b9c01bf2f2
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/game/objects/items/devices/uplink.dm
2015-09-07 11:17:06 +09:30
Chinsky
2563821832
Merge pull request #10972 from Zuhayr/resomi
...
Adds the Resomi.
2015-09-06 13:09:34 +03:00
PsiOmega
cc960624b9
Fixes mercenary mode not listing bought items.
...
The mercenary leader now spawns with the uplink, as is set as its owner.
2015-09-06 10:43:09 +02:00
Chinsky
71d1853ede
Merge pull request #10993 from Zuhayr/species
...
Human subspecies.
2015-09-06 04:25:21 +03:00
Zuhayr
2b2e27d380
Species flash cleanup.
2015-09-06 10:09:03 +09:30
GinjaNinja32
348f678b81
Merge pull request #10997 from PsiOmegaDelta/150904-RadioAccess
...
Observers can now view radio settings, admins can alter them.
2015-09-05 16:59:42 +01:00
Zuhayr
6dc3b22432
Death to flashrev (compile fix)
2015-09-06 00:45:13 +09:30
Zuhayr
808bbee90f
Added species vars for oxy/tox/rad/flash resistance.
2015-09-06 00:39:05 +09:30
PsiOmega
95b12da391
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/__defines/gamemode.dm
code/game/antagonist/outsider/ert.dm
code/game/gamemodes/ninja/ninja.dm
2015-09-05 09:35:02 +02:00
PsiOmega
69fde6af03
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/antagonist/alien/borer.dm
code/game/gamemodes/game_mode.dm
code/game/gamemodes/nuclear/nuclear.dm
code/game/gamemodes/traitor/traitor.dm
code/game/objects/items/robot/robot_parts.dm
code/setup.dm
2015-09-05 09:24:30 +02:00
Zuhayr
23fb8d8b99
Antag system cleanup/fixes.
2015-09-04 18:28:05 +09:30
PsiOmega
93a8a3a13f
Observers can now view radio settings, admins can alter them.
2015-09-04 10:07:41 +02:00
Zuhayr
a41ce0bd93
Added the Resomi.
2015-09-04 08:57:03 +09:30
PsiOmega
e5aa095f09
Non-headset/borg radios now all allow access to department channels. Headset and borg radios still rely on their encryption keys.
2015-09-03 09:38:15 +02:00
PsiOmega
52eae80d74
Makes the cyborg radio menu more consistent.
2015-09-03 08:41:02 +02:00
PsiOmega
13780eba09
Rotates and otherwise cleans up map intercom usage.
2015-09-02 14:26:59 +02:00
PsiOmega
1b23f794c5
Merge remote-tracking branch 'upstream/dev' into 150822-Intercoms
2015-09-02 10:54:04 +02:00
PsiOmega
c730a67d79
Makes it possible to select department channels on intercoms.
2015-09-02 10:38:16 +02:00
Kelenius
57ab846273
Merge branch 'dev' into ofMechfabAndPanic
...
Conflicts:
maps/exodus-1.dmm
2015-08-31 10:57:04 +03:00
PsiOmega
0bd41e604b
Merge remote-tracking branch 'upstream/dev' into Backup
2015-08-30 15:55:10 +02:00
PsiOmega
e1aa20fda5
Radio changes.
...
Removes the radio free range option.
Instead all users can move within the standard radio frequency range, while authorized users can also select department channels.
2015-08-29 17:12:48 +02:00
PsiOmega
35ea424edc
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
...
Conflicts:
code/modules/clothing/spacesuits/rig/rig.dm
2015-08-29 10:06:18 +02:00
PsiOmegaDelta
d02108043c
Revert "IAA cartridge tweak"
2015-08-25 12:48:42 +02:00
PsiOmegaDelta
2fdf859122
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-25 08:20:13 +02:00
PsiOmegaDelta
713a7bd654
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/devices/flashlight.dm
2015-08-25 08:12:39 +02:00
Zuhayr
9087466552
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into randmap
2015-08-25 12:29:59 +09:30
HarpyEagle
e03585898d
Cleans up flashlight fix
...
Moves icon state changes into update_icon(), less duplicated code. Also
makes glowing slime extracts less dumb.
2015-08-24 16:31:31 -04:00
Sligneris
d74b8f9dc3
IAA cartridge tweak
...
Adds Employment Records to IAA cartridges.
2015-08-24 21:43:39 +02:00
Kelenius
dd11a301e4
Merge branch 'dev' into ofMechfabAndPanic
...
Conflicts:
code/game/mecha/mech_fabricator.dm
maps/exodus-1.dmm
2015-08-24 18:16:36 +03:00
PsiOmegaDelta
3de6d1b19c
Merge pull request #10381 from Zuhayr/hardsuitcontrol
...
Rig AI movement and module control buffs.
2015-08-24 12:04:31 +02:00
PsiOmegaDelta
9057655da6
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/clothing/clothing.dm
code/modules/clothing/spacesuits/spacesuits.dm
code/modules/clothing/spacesuits/void/merc.dm
code/modules/clothing/spacesuits/void/void.dm
code/modules/mob/living/carbon/human/examine.dm
code/modules/mob/living/silicon/ai/ai.dm
2015-08-24 10:31:30 +02:00
PsiOmegaDelta
c376c08cc0
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/structures/girders.dm
code/modules/mob/living/carbon/human/human_damage.dm
2015-08-24 10:23:12 +02:00
Zuhayr
23564bda0c
Merge pull request #10694 from PsiOmegaDelta/150817-SynthAccess
...
Synths now relies on access permissions as well.
2015-08-24 17:45:10 +09:30
Zuhayr
8bc72a465c
Should fix AI-camera breaking when moved between cards.
2015-08-24 17:12:41 +09:30
PsiOmegaDelta
0b163b89ae
Fixes #10815 .
...
Now uses audible message. Added a message for deaf mobs.
2015-08-24 09:16:35 +02:00
Zuhayr
9cbacd6653
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hardsuitcontrol
...
Conflicts:
code/_onclick/click.dm
2015-08-23 02:24:34 +09:30
Zuhayr
90e51b87e3
Refactoring hardsuit click checking.
2015-08-23 02:14:55 +09:30
