PsiOmegaDelta
3de6d1b19c
Merge pull request #10381 from Zuhayr/hardsuitcontrol
...
Rig AI movement and module control buffs.
2015-08-24 12:04:31 +02:00
Zuhayr
c5972cb421
Removing an istype() check.
2015-08-24 19:03:57 +09:30
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
volas
d31203c70f
Sanitize for AI emergency message
2015-08-23 15:24:52 +03: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
mwerezak
13c760c5bb
Fixes #9453 and fixes #10614
2015-08-22 11:09:17 -04:00
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
edf74e4721
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
code/modules/admin/topic.dm
2015-08-22 02:30:14 +09:30
Zuhayr
55c1331261
Merge pull request #10004 from PsiOmegaDelta/150703-AISight
...
Active AI cores now provides camera coverage.
2015-08-22 02:21:36 +09:30
Zuhayr
3bfa541612
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-22 02:10:11 +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
PsiOmegaDelta
cd06409a1f
Makes it possible for syndicate borgs to copy access from other ids.
2015-08-20 13:49:53 +02:00
PsiOmegaDelta
c2e2252342
Synth access and icon update changes.
...
Refactors how synthetics set their modules. On login, if appearance selection was initiated but not finalized, the selection options popup again. Fixes a long-standing issue of borgs being able to look like the standard module by loging out.
Ensures the syndicate agent IDs and syndicate borgs will always have the same initial access permissions.
Removes now unnecessary syndicate snowflake code from NanoUI.
Synths now utilize actual ids.
2015-08-20 12:40:08 +02:00
PsiOmegaDelta
1c92c62399
Merge remote-tracking branch 'upstream/dev' into 150817-SynthAccess
2015-08-20 10:01:19 +02: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
PsiOmegaDelta
15f54c595b
Synths now relies on access permissions as well.
...
Ensures station bound synthetics will not be able to utilize Syndicate/Heist equipment/vessels, as well as the opposite for potential syndicate synths.
2015-08-17 09:12:40 +02:00
PsiOmegaDelta
9d0c072b4a
Adjusts Bump flags to make ALLMOBS mean all mobs again.
2015-08-17 08:06:42 +02:00
Zuhayr
23e9c7d4c9
Merge
2015-08-16 17:10:11 -07:00
GinjaNinja32
f0c9f16099
Merge pull request #10677 from PsiOmegaDelta/150816-SynthSay
...
Synth say fixes.
2015-08-16 14:55:04 +01: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
0b01482eb6
Synth say fixes.
...
Adds synth message sanitizing. Fixes #10667 .
Makes sure say() code at least to some degree returns expected values. Fixes #10675 .
2015-08-16 14:00:29 +02:00
GinjaNinja32
7dc85cfdd4
Merge pull request #10040 from PsiOmegaDelta/150707-MoreOverlaysFewerStates
...
Computers are now overlay based.
2015-08-16 00:40:47 +01:00
PsiOmega
1186ec2af6
The stat panel now displays station time along with current round duration.
2015-08-15 22:09:18 +02:00
PsiOmega
c81ad0964e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/reagents/reagent_containers/food/drinks/bottle.dm
2015-08-15 11:06:03 +02:00
PsiOmega
cda0ecfa97
Relocates Malfunction code to appropriate location.
2015-08-15 10:52:39 +02:00
PsiOmega
3a08e2884a
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/structures/crates_lockers/largecrate.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/research/circuitprinter.dm
2015-08-15 10:52:17 +02:00
Chinsky
8a21670d0b
Merge pull request #10639 from GinjaNinja32/language
...
Fix not being able to select Siik'tajr or Sinta'unathi as default via Check-Known-Languages
2015-08-15 06:11:58 +03:00
GinjaNinja32
88433b6b98
Merge pull request #10641 from atlantiscze/kill-all-humans
...
Newmalf Fixes
2015-08-15 03:36:35 +01:00
Atlantis
7e8bfde893
Increases CPU income from APC hacking
...
- CPU generation from APCs is now doubled
2015-08-14 23:03:48 +02:00
Atlantis
20961ae9b6
Corrects wrongly displayed CPU generation.
...
- Value displayed was per decisecond, not per second. Corrected.
2015-08-14 23:00:53 +02:00
GinjaNinja32
2847c08b77
Fix not being able to select Siik'tajr or Sinta'unathi as default via Check-Known-Languages
2015-08-14 21:30:09 +01:00
PsiOmegaDelta
d5c6d9c341
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-14 08:43:43 +02:00
PsiOmegaDelta
3a55b130a0
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
.travis.yml
code/modules/virus2/disease2.dm
maps/exodus-5.dmm
2015-08-14 08:34:42 +02:00
mwerezak
b5425e0bd9
Makes beer and ale bottles into actual bottles, adjusts bottle smashing
...
Generalizes opening drink containers, makes beer and ale bottles a subtype of bottle instead of can
Adjusts bottle smashing, duration, damage, and reliability.
2015-08-13 18:37:13 -04:00
Zuhayr
4674333143
Minor holder refactor.
2015-08-13 17:31:42 +09:30
Zuhayr
ab49ac0d6d
Adds hats to dionaea.
2015-08-13 17:31:41 +09:30
Zuhayr
2f6a1f2830
Added hats for drones.
2015-08-13 17:31:40 +09:30
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
PsiOmegaDelta
e1db48e50f
Typo fix.
...
Minor typo fix: Unladed to unloaded.
2015-08-13 09:26:41 +02:00
PsiOmegaDelta
1b10f78940
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2015-08-13 09:01:10 +02:00
GinjaNinja32
792d6e2864
Merge pull request #10579 from mwerezak/misc
...
Fixes
2015-08-12 22:21:34 +01:00
HarpyEagle
7a86d6e658
Fixes #10571
...
Adds another snowflake electronic item to the can_hold list.
2015-08-12 16:06:31 -04: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
mwerezak
5b6c5ee5ce
Merge pull request #10570 from Zuhayr/master
...
Couple of fixes.
2015-08-12 15:00:36 -04:00
