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
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
55c1331261
Merge pull request #10004 from PsiOmegaDelta/150703-AISight
...
Active AI cores now provides camera coverage.
2015-08-22 02:21:36 +09:30
a234d8b096
Merge pull request #10022 from PsiOmegaDelta/150705-SecretAdminDatums
...
Admin secret panel refactor.
2015-08-22 02:18:39 +09:30
3bfa541612
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-22 02:10:11 +09:30
317eaf4771
Merge pull request #10101 from mwerezak/shards
...
Refactors obj flags and changes defined bitflag representation
2015-08-20 19:47:58 +03:00
120ce3f20c
Merge remote-tracking branch 'upstream/dev' into 150705-SecretAdminDatums
...
Conflicts:
code/modules/admin/topic.dm
2015-08-20 14:16:35 +02:00
c346b99371
Merge remote-tracking branch 'upstream/dev' into 150817-SynthAccess
...
Conflicts:
code/game/objects/items/weapons/cards_ids.dm
2015-08-20 12:42:51 +02:00
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
c8b6813426
Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery
...
Uplink Items - Part III
2015-08-20 19:19:12 +09:30
c43ce91a99
Merge remote-tracking branch 'upstream/dev' into 150819-MoreDecalsBecauseYouLoveThem
2015-08-19 18:25:41 +02:00
f46fcfaf52
Adds more decals. Moving turfs now includes under/overlays.
2015-08-19 10:44:42 +02:00
a9773207b2
Merge remote-tracking branch 'upstream/dev' into client_dir
2015-08-19 09:42:48 +01:00
d70f064b1b
Adjusts phoron exposure to use body_parts_covered
2015-08-18 17:18:25 -04:00
651c2c6ba6
Species spawn_flags
...
Moves some more species flags into a new spawn_flags var.
2015-08-18 17:02:45 -04:00
1957029890
HUD cleanup, human/monkey HUD now turns correctly with client.dir
2015-08-18 18:21:25 +01:00
e92e819bd9
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-18 18:29:01 +02:00
8138815dc3
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-08-18 18:05:16 +02:00
0e4c2430d1
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
2015-08-18 11:59:50 -07:00
71214d859e
Merge with master.
2015-08-18 11:31:10 -07:00
74b8f6c3be
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
html/changelogs/.all_changelog.yml
2015-08-17 09:44:21 +02:00
55bc41241f
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/setup.dm
2015-08-17 09:37:49 +02:00
eccdfd8d9a
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
2015-08-16 05:45:16 -07:00
7e8713039a
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
2015-08-16 05:40:47 -07:00
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
bc73de33b8
Id cards are now cool when examined.
2015-08-14 15:40:39 +02:00
0380d5d9d4
Completes the feature where mercenaries can setup fake crew announcements and records.
2015-08-14 13:42:11 +02:00
efef67a3e4
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-13 09:11:05 +02:00
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
3fd8627bd7
Merge pull request #9996 from PsiOmegaDelta/150702-AtmosAnalyzeCleanup
...
Refactors gas analyzation.
2015-08-13 07:23:10 +03:00
81932abb29
Merge pull request #9995 from PsiOmegaDelta/150630-AddingThatMissing24GHour0ItIsDrivingMeInsaneAlright
...
Time padding.
2015-08-13 07:23:05 +03:00
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
f8d86900a5
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/new_player/preferences_setup.dm
code/setup.dm
2015-08-01 19:45:42 +02:00
7e6cb6f38c
Compilation/definition fixes.
2015-07-31 10:05:42 +02:00
c28b3721b4
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_helpers/unsorted.dm
code/modules/clothing/glasses/glasses.dm
code/modules/mob/living/carbon/human/life.dm
code/setup.dm
2015-07-31 10:00:16 +02:00
5cbb703609
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_helpers/unsorted.dm
code/game/jobs/access.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/update_icons.dm
code/modules/organs/organ.dm
code/modules/reagents/Chemistry-Holder.dm
code/setup.dm
2015-07-27 10:20:20 +02:00
34fdc4712e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_helpers/names.dm
code/game/jobs/job/silicon.dm
code/game/objects/items.dm
code/modules/mining/abandonedcrates.dm
code/modules/mob/living/carbon/brain/life.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
code/modules/nano/modules/alarm_monitor.dm
code/setup.dm
2015-07-14 08:21:12 +02:00
9b4d09c974
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_helpers/unsorted.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/grenades/emgrenade.dm
code/modules/clothing/spacesuits/rig/rig_attackby.dm
2015-07-11 10:58:49 +02:00
916c9972d9
Better num2hex
...
More concise and readable, and faster too.
2015-07-09 22:51:21 -04:00
746ac180aa
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-07-08 09:11:47 +02:00
457987046b
Re-implements world end events as datums.
2015-07-07 23:09:03 +02:00
a81113b877
Update time.dm
...
Restores proper roundstart hours.
2015-07-05 08:11:31 +02:00
92a3d3f9ae
An active AI core now provides camera coverage.
2015-07-03 09:46:02 +02:00
48ee872691
Refactors gas analyize.
2015-07-02 15:32:21 +02:00
c2c4336afe
Changelog entry.
2015-06-30 09:51:38 +02:00
10c2e32f4c
Now pads a 0 to single digit hours.
2015-06-30 09:50:12 +02:00
f420dd9f01
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
.travis.yml
code/modules/mob/living/carbon/brain/life.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/living_defines.dm
code/modules/mob/living/silicon/silicon.dm
code/setup.dm
2015-06-30 08:59:34 +02:00
94406a6430
Merge pull request #9694 from PsiOmegaDelta/150605-Meteors
...
Ports /tg/'s meteors.
2015-06-08 14:17:57 +03:00
fc6de24042
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/weapons/tanks/tanks.dm
code/modules/materials/material_sheets.dm
code/modules/organs/organ_icon.dm
code/setup.dm
2015-06-07 10:51:41 +02:00
079b0af6b0
Adds spinning animation for meteors.
2015-06-05 15:55:39 +02:00
Zuhayr