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
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
Zuhayr
b702c81060
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into randmap
...
Conflicts:
code/game/turfs/simulated/floor_types.dm
2015-08-22 03:57:12 +09:30
Zuhayr
a00ac82221
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hardsuitcontrol
...
Conflicts:
code/_onclick/rig.dm
2015-08-22 02:36:05 +09:30
Zuhayr
3bfa541612
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-22 02:10:11 +09:30
Zuhayr
b4b7719557
Merge pull request #9888 from Vivalas/dev
...
[DEV] Re-adds the new uplink item
2015-08-22 01:34:01 +09:30
PsiOmegaDelta
1e7251ded4
Id card handling changes.
...
Equipment now first checks if an id card may be removed, rather than always forcefully doing so.
Station synthetics now have a custom id, rather than re-using the captain's spare, as utilizing robotic storage would otherwise make their id cards available for public use.
2015-08-21 14:04:06 +02:00
Chinsky
317eaf4771
Merge pull request #10101 from mwerezak/shards
...
Refactors obj flags and changes defined bitflag representation
2015-08-20 19:47:58 +03:00
PsiOmegaDelta
cd06409a1f
Makes it possible for syndicate borgs to copy access from other ids.
2015-08-20 13:49:53 +02:00
Zuhayr
c8b6813426
Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery
...
Uplink Items - Part III
2015-08-20 19:19:12 +09:30
FrickenChris101
a4b3ab1ca5
Flashlight Icon toggle fix
...
Just added additional code to update_brightness call and initialize.. Wasn't properly reflecting light being on or off.
2015-08-19 20:17:59 -04:00
mwerezak
b80c01ffbe
Removes *COVERSEYES
...
Removes (HEAD|MASK|GLASSES)COVERSEYES flags, in favour of using
body_parts_covered.
2015-08-18 17:06:49 -04:00
Zuhayr
80dbe49ee1
Removing unneeded defines.
2015-08-19 14:23:27 +09:30
Zuhayr
e3d9bc90e3
Added more colour defines, added functionality to the floor painter.
2015-08-18 13:41:04 -07:00
Zuhayr
a8dc3a282b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into turfs
2015-08-18 12:06:53 -07:00
PsiOmegaDelta
74b8f6c3be
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
html/changelogs/.all_changelog.yml
2015-08-17 09:44:21 +02:00
PsiOmegaDelta
55bc41241f
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/setup.dm
2015-08-17 09:37:49 +02:00
Zuhayr
ac261213e9
Rewrites the floor painter.
2015-08-16 20:58:54 -07:00
Zuhayr
3b712adb5f
Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes.
2015-08-16 17:51:19 -07:00
PsiOmega
21fd8d825d
Makes the private AI channel truly private.
2015-08-16 15:43:28 +02:00
Kelenius
7c1d9b5614
Mech chargers are now a single machine
...
Can be built and upgraded
Resolves #5215
2015-08-16 06:07:36 -07:00
Zuhayr
c8baafed2a
Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and
...
construction/deconstruction. Major map rework/changes.
2015-08-16 06:05:21 -07:00
PsiOmega
b879db05b4
Makes the fake crew record creation utilize all the new id fields.
2015-08-15 17:03:19 +02:00
PsiOmega
c51e208094
One can now greatly customize syndicate ids. Partially based on https://github.com/ParadiseSS13/Paradise/pull/1686 .
2015-08-15 15:22:37 +02:00
PsiOmegaDelta
bc73de33b8
Id cards are now cool when examined.
2015-08-14 15:40:39 +02:00
PsiOmegaDelta
0380d5d9d4
Completes the feature where mercenaries can setup fake crew announcements and records.
2015-08-14 13:42:11 +02:00
PsiOmegaDelta
02b6021277
Compilation fixes.
...
It's apparently 10mm now.
2015-08-14 08:51:06 +02:00
Chinsky
c664ca6096
Merge pull request #10276 from mwerezak/uplink-items
...
Allows traitors the option of purchasing the C-20r or STS-35
2015-08-14 03:55:03 +03:00
Chinsky
c5d54ba454
Merge pull request #10455 from mwerezak/t-scanner
...
Adds client image based t-scanner
2015-08-14 01:39:36 +03:00
Zuhayr
59d0e28aff
Allowed pAIs and AIs loaded into hardsuits to move and rest when control is enabled or the user is unconcious/dead.
...
Allows AIs/pAIs in rigs to use the selected module via middle click.
2015-08-13 17:09:22 +09:30
Zuhayr
231eaf7e76
Added antag uplink option for hacked supply pod.
2015-08-13 16:59:18 +09:30
PsiOmegaDelta
db565ae2ff
Merge remote-tracking branch 'upstream/dev' into 150703-Uplinkery
...
Conflicts:
code/datums/datacore.dm
code/defines/obj.dm
2015-08-13 08:11:32 +02:00
Chinsky
3fd8627bd7
Merge pull request #9996 from PsiOmegaDelta/150702-AtmosAnalyzeCleanup
...
Refactors gas analyzation.
2015-08-13 07:23:10 +03:00
PsiOmega
ba240cb768
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/antagonist/station/rogue_ai.dm
code/game/machinery/atmoalter/portable_atmospherics.dm
code/game/machinery/spaceheater.dm
code/modules/clothing/head/soft_caps.dm
maps/exodus-5.dmm
2015-08-12 21:18:18 +02:00
PsiOmega
e4f6436a85
Fixes #10494 .
...
Borgs have their very own custom little headset, so cute.
2015-08-11 21:11:16 +02:00
GinjaNinja32
631ff21980
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/gamemodes/cult/runes.dm
code/game/objects/items/weapons/implants/implantcase.dm
code/game/objects/items/weapons/melee/energy.dm
code/modules/mob/living/carbon/human/emote.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/human_attackhand.dm
code/modules/mob/living/silicon/robot/drone/drone.dm
code/modules/mob/living/silicon/robot/emote.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/nano/modules/crew_monitor.dm
code/modules/organs/organ_internal.dm
2015-08-11 18:47:05 +01:00
SomeoneElse
8c0984d5b1
Fix gender issues, some typos from various files
2015-08-11 13:41:40 +03:00
mwerezak
11d959e767
Adds client image based t-scanner
...
Replaces the t_scanner implementation with one that sends overlays to the client holding the t-ray item. Fixes #9437
2015-08-08 22:26:38 -04:00
