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
d7b6784e28
Fixes law change logging.
...
The "Show last X law changes" review window should now actually be useful, displaying AI law updates with time, user, and law change.
2015-10-13 19:44:49 +02: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
Zuhayr
5dc6ff5da1
Merge pull request #11230 from PsiOmegaDelta/xenomorphs
...
Xenomorph update
2015-10-13 08:31:27 +10:30
HarpyEagle
241520f0bb
Cleans up autospawn, now uses existing code for selecting and choosing
...
candidates. Adds more debug messages, and removes unused code.
2015-10-12 13:03:50 -04: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
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
PsiOmegaDelta
13b175c529
Merge remote-tracking branch 'upstream/dev' into xenomorphs
...
Conflicts:
code/game/objects/effects/aliens.dm
code/game/objects/structures/lamarr_cage.dm
2015-10-10 12:05:36 +02:00
GinjaNinja32
d5928d9927
Merge pull request #11260 from mwerezak/ttv
...
Fixes TTV Yield
2015-10-10 09:05:00 +01:00
HarpyEagle
63838b01d4
Updates preset TTV bombs, adds debug verb
2015-10-09 11:18:12 -04:00
GinjaNinja32
1f1857cc0a
Merge pull request #11257 from Karolis2011/map_capture
...
Added more help/error messages to the capture tool.
2015-10-09 11:35:54 +01:00
Karolis2011
fad0e0b28a
Added more help/error messages to the tool.
2015-10-08 12:36:09 +03:00
PsiOmegaDelta
8eee143177
Merge remote-tracking branch 'upstream/dev' into xenomorphs
...
Conflicts:
baystation12.dme
2015-10-01 09:48:51 +02:00
PsiOmega
63de1764c3
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-27 13:48:33 +02:00
PsiOmega
807e7bf954
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/spells/artifacts.dm
2015-09-27 13:36:56 +02:00
HarpyEagle
380b89fcc0
Fixes #11130 , renames aghosted var
...
because it is no longer used solely for aghosting.
2015-09-26 20:48:13 -05:00
PsiOmega
709840f848
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/admin/DB ban/functions.dm
2015-09-26 08:48:37 +02:00
PsiOmega
145d8d91ef
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/_helpers/unsorted.dm
2015-09-26 08:43:06 +02:00
PsiOmegaDelta
509486dbd9
Merge pull request #11181 from GinjaNinja32/crash_with
...
Add proc/crash_with, fix two incorrect qdel calls
2015-09-25 06:31:38 +02:00
GinjaNinja32
8ed4faf7b2
Add proc/crash_with, fix two incorrect qdel calls
2015-09-23 13:29:54 +01:00
GinjaNinja32
9be47c6374
Permabans do not expire, and we don't need to show expired when it's been manually lifted
2015-09-23 13:03:11 +01:00
GinjaNinja32
c707519d1f
Add specific color for expired bans in ban panel, fix some formatting and a runtime
2015-09-23 12:58:39 +01:00
Zuhayr
22ef779f65
Cherrypicked xenophage-rewrite mechanics over.
2015-09-21 20:36:45 +09:30
PsiOmegaDelta
7ce27f76fd
Macro refactoring.
...
Turns several of the is* procs into istype defines.
2015-09-16 12:57:14 +02:00
PsiOmega
5863112d2d
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/clothing/spacesuits/rig/rig.dm
2015-09-15 20:31:59 +02:00
PsiOmega
5c1b8380a4
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/tanks/jetpack.dm
code/game/objects/items/weapons/tanks/tanks.dm
2015-09-15 20:25:13 +02:00
Kelenius
9dd6f9762a
Resolves #11049
2015-09-14 12:05:28 +03:00
GinjaNinja32
3a952d26df
Replace ';' with '; // do nothing' for clarity
2015-09-10 04:00:37 +01:00
GinjaNinja32
4ed33603c2
Implement VV header and options for virus2 datums
2015-09-10 03:58:10 +01:00
GinjaNinja32
be2279106f
Merge remote-tracking branch 'upstream/dev' into vv
...
Conflicts:
code/modules/admin/verbs/debug.dm
code/modules/admin/view_variables/topic.dm
2015-09-10 03:06:27 +01:00
PsiOmegaDelta
94b4c483ba
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-08 08:22:37 +02:00
PsiOmegaDelta
2f183e1cee
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/devices/uplink.dm
code/modules/nano/modules/human_appearance.dm
2015-09-08 07:58:25 +02:00
Zuhayr
211e426009
Tweak.
2015-09-07 14:43:20 +09:30
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
9533f2d154
Merge pull request #11026 from GinjaNinja32/announcement
...
Improve formatting of admin announcements
2015-09-07 01:02:36 +03:00
GinjaNinja32
5a335c9140
Improve formatting of admin announcements
2015-09-06 20:41:06 +01:00
Zuhayr
f8bf428e66
Merge pull request #10981 from comma/technoir
...
MrSnapwalk's Detective Uniform Resprite
2015-09-06 00:48:50 +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
f74182680c
Fixes autotraitor.
2015-09-05 13:15:30 +09:30
Zuhayr
7af1f27b28
More debug feedback.
2015-09-05 12:57:20 +09:30
Zuhayr
58cd8c3e03
Added debug verbs/feedback.
2015-09-05 12:05:32 +09:30
Zuhayr
553ac01552
Autotraitor cleanup.
2015-09-04 20:17:47 +09:30
Zuhayr
23fb8d8b99
Antag system cleanup/fixes.
2015-09-04 18:28:05 +09:30
Chinsky
a3b3e52959
Merge branch 'dev' of https://github.com/comma/Baystation12 into technoir
2015-09-02 04:38:26 +03: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
PsiOmega
ff7a4fc244
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/events/event_container.dm
2015-08-28 11:18:57 +02:00
PsiOmega
f68275d91b
Improved admin logging.
...
log_and_message_admins() (which sure needs a shorter name) now uses key_name_admin() instead of just key_name().
Replaces calls to admin_log_and_message_admins() which did this with log_and_message_admins() instead.
2015-08-27 20:20:20 +02:00
