PsiOmega
145d8d91ef
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/_helpers/unsorted.dm
2015-09-26 08:43:06 +02:00
GinjaNinja32
8ed4faf7b2
Add proc/crash_with, fix two incorrect qdel calls
2015-09-23 13:29:54 +01: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
43a349ee2a
Fixes #11022
2015-09-07 14:25:45 +09:30
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
a0187f66e3
Fixes Secret.
2015-09-05 14:12:20 +09:30
Zuhayr
23fb8d8b99
Antag system cleanup/fixes.
2015-09-04 18:28:05 +09:30
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
Atlantis
5811b6021e
Machinery controller now reports amounts of powernets and pipenets as well.
2015-08-20 23:06:52 +02:00
Atlantis
e30e461843
Corrects supermatter fluctuations v2
...
- Better implementation of #10714
- This fix corrects the issue by merging pipenet process to machinery process to ensure order of execution doesn't change randomly. This shouldn't have any performance effect as pipenet process doesn't have much work anyway (not to be confused with air process that runs ZAS, this one only called process() on each pipenet). Screenshot of profiler (pipenet process highlighted, idle server with one player, engine set up) http://i.imgur.com/ecCg6rS.png
- Unlike previous fix, this does not come with various game-affecting side effects, players shouldn't see a change (except for the fact that odd fluctuations introduced by devmerge disappear). Previous fix buffed engine output as side effect, and caused one TEG to generate considerably more than second TEG, which caused TEGs to begin sparking despite overall output being below 1MW.
2015-08-20 22:23:45 +02:00
GinjaNinja32
894b559e29
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-08-19 07:04:40 +01:00
mwerezak
b361f9ad12
Fixes #10723
2015-08-18 10:28:06 -04:00
mwerezak
7c8c42137e
Fixes #10680
2015-08-18 02:54:13 -04: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
1dcdb423c7
Merge pull request #10685 from mwerezak/skipjack
...
Fixes
2015-08-17 06:56:50 +02:00
mwerezak
524548cc95
Fixes #10680
2015-08-16 14:58:27 -04:00
PsiOmega
21fd8d825d
Makes the private AI channel truly private.
2015-08-16 15:43:28 +02:00
Zuhayr
7e8713039a
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
2015-08-16 05:40:47 -07:00
mwerezak
4b21f5f8ad
Fixes pipes disappearing when wrenching fails
2015-08-15 15:46:52 -04: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
PsiOmegaDelta
54162f1c7d
Merge remote-tracking branch 'upstream/dev-freeze' into 150702-SpellFixes
2015-08-11 12:20:54 +02:00
PsiOmega
3d03842f8a
Adds missing closing quote.
2015-08-10 18:10:53 +02:00
PsiOmega
570806046b
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/clothing/clothing.dm
code/modules/mob/living/carbon/human/inventory.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/mob/living/silicon/robot/custom_sprites.dm
code/modules/organs/organ_stump.dm
code/setup.dm
2015-08-10 17:56:14 +02:00
PsiOmega
fb6ab23189
Makes the new initialization message use the proper method.
2015-08-10 17:46:38 +02:00
PsiOmega
a710e77d46
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/controllers/master_controller.dm
code/game/area/areas.dm
2015-08-10 17:42:40 +02:00
mwerezak
12549b7e93
Fixes area power initialization
...
Power channels start on when objects initialize, then are turned off and area machines notified in area initialization if an apc is not found.
2015-08-09 19:58:37 -04:00
Kelenius
25eaeecb24
Optimizes reference finder
2015-08-07 09:28:29 +03:00
Kelenius
16ca8ca768
Optimizes garbage reference searcher
2015-08-06 10:48:14 +03:00
Kelenius
cc83f35d72
Searches for references to hard-deleted objects
2015-08-05 18:10:41 +03:00
PsiOmegaDelta
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
Zuhayr
e0429af2f7
Added config option for initial brain organ health.
2015-07-27 15:33:54 +09:30
Zuhayr
4afa8a80f8
Readds config option to disable organ decay.
2015-07-27 15:30:38 +09:30
PsiOmega
2d24960603
Fixes #9894 some more.
...
Ensures the vote sanity check is done first, before any change of vote counts.
2015-07-26 10:45:05 +02:00
PsiOmegaDelta
617db485ee
qdel/Destroy entries.
2015-07-21 14:22:01 +02:00
PsiOmega
34b0517578
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/admin/topic.dm
code/modules/mob/living/carbon/human/examine.dm
code/modules/nano/modules/atmos_control.dm
code/modules/research/circuitprinter.dm
code/modules/research/designs.dm
2015-07-17 23:19:34 +02:00
PsiOmega
b4d15ceb6e
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/examine.dm
code/modules/mob/living/carbon/human/inventory.dm
2015-07-17 23:09:24 +02:00
PsiOmega
4aa11441cc
Fixes #10212 .
...
NSV Icarus is now NDV Icarus.
2015-07-16 20:32:56 +02:00
PsiOmegaDelta
c6f4f7fcee
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-07-12 15:14:43 +02:00
PsiOmegaDelta
7b3759c1f3
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/controllers/configuration.dm
code/modules/admin/topic.dm
config/example/config.txt
2015-07-12 14:49:31 +02:00
PsiOmegaDelta
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
Null Snapshot
168f823c35
Fixed up the things pointed out by Ccomp5950.
2015-07-09 22:19:05 -07:00
Null Snapshot
a28d3cd9d1
Added new config variables for toggling moderator tempban permissions and maximum duration for bans.
2015-07-09 12:10:18 -07:00
GinjaNinja32
f3d09e092e
Removes the approximations cheap_pythag and cheap_hypotenuse, since they're anything *but* cheap
2015-07-09 16:25:47 +01:00
Kelenius
879fc98a8c
Fixes #9894
2015-07-09 11:50:42 +03:00
PsiOmega
f25e8a7a67
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/stacks/tiles/plasteel.dm
code/game/objects/items/stacks/tiles/tile_types.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/pai/pai.dm
code/modules/surgery/implant.dm
code/setup.dm
2015-06-26 20:28:47 +02:00
Chinsky
5dda5021a3
Fixed a list being qdel'd when radio is deleted.
2015-06-25 23:04:04 +03:00
Zuhayr
48cf00ca54
Merge with dev-freeze.
2015-06-21 20:45:47 +09:30
Zuhayr
ec5e05b9f1
Antagonist system refactor. Fixes #9495 , #9290 , #9521 , #8800 and #9465 .
2015-06-21 18:08:26 +09:30
PsiOmegaDelta
1558bd5b75
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/toys.dm
code/modules/mob/living/carbon/brain/life.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/living_defense.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
code/modules/reagents/reagent_containers.dm
html/changelogs/.all_changelog.yml
2015-06-19 10:19:08 +02:00
PsiOmegaDelta
f5da9f70c5
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
config/example/config.txt
2015-06-19 09:55:48 +02:00
