PsiOmegaDelta
c63f4c62b5
Merge remote-tracking branch 'upstream/dev' into 150702-MoneyMoneyMoney
...
Conflicts:
code/__defines/mobs.dm
code/game/jobs/job/civilian.dm
code/game/jobs/job_controller.dm
2015-08-13 08:06:11 +02: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
GinjaNinja32
5a1c80d843
Fix for non-ANTAG_OVERRIDE_JOB antags breaking with malf fix
2015-08-12 05:06:18 +01:00
GinjaNinja32
54930b69b4
Malfunction
2015-08-12 04:41:59 +01: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
SomeoneElse
64c59d3145
replace \red usages with various <span> usages in runes.dm
...
code/game/gamemodes/cult/rules.dm:
replaced {\red,\b} with <span class='{danger,warning,cult}'>.
added some span class guidelines esp. on cult for future consistency.
2015-08-10 12:58:37 +03:00
PsiOmega
e875a7ce48
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/computer3/buildandrepair.dm
code/game/objects/items/devices/lightreplacer.dm
code/modules/research/circuitprinter.dm
code/modules/research/protolathe.dm
2015-08-08 15:34:51 +02:00
PsiOmegaDelta
c560bd8d79
Merge pull request #10404 from mwerezak/stack-fix
...
Material stack related fixes
2015-08-08 09:56:25 +02:00
PsiOmegaDelta
3e266ab377
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-05 09:25:53 +02:00
PsiOmegaDelta
93011f94c4
Merge pull request #10425 from Baystation12/dev-freeze
...
Dev
2015-08-04 13:07:11 +02:00
mwerezak
d25d0c700c
Fixes #10403
...
can_start() no longer attempts to rebuild the antag candidate lists but
instead reads the existing lists that are now built in pre_setup()
Also fixes an inverted check that was preventing antags from spawning.
2015-08-03 20:01:55 -04:00
mwerezak
2e1607f611
Fixes #10414
...
Antagonists are again drafted in attempt_spawn() and all players in the pending list will be spawned (provided they pass sanity checks).
Instead, attempt_spawn() is called in either pre_setup() or post_setup() depending on if the ANTAG_OVERRIDE_JOB flag is set. And all antags have
their spawning finalized in post_setup().
In addition, if game mode setup fails, all pending antagonist players have their special roles cleared.
2015-08-03 12:03:08 -04:00
mwerezak
0ceb0e291d
Fixes #10314
...
Replaces every check for a hardcoded material stack type with a check
for material of the stack.
2015-08-02 00:01:10 -04:00
Zuhayr
82152daa30
Merge pull request #10393 from Baystation12/dev-freeze
...
Dev freeze
2015-07-31 18:59:03 +09:30
PsiOmegaDelta
75920431e8
Merge pull request #10386 from mwerezak/antag-fix
...
Fixes #10309
2015-07-31 10:26:14 +02:00
PsiOmegaDelta
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
PsiOmegaDelta
3c9dc10746
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/gamemodes/cult/runes.dm
2015-07-31 09:48:15 +02:00
HarpyEagle
7feaf13d81
Fixes #10309
...
Antag types with ANTAG_OVERRIDE_JOB are finalized before jobs are handed out, based on the idea that something which replaces a player's job should not need to depend on their assigned job in any way.
Moves the selection of pending antags outside of can_start().
Fixes issue with antag distribution that occurs when a player is a candidate for multiple antagonist types.
2015-07-30 22:28:17 -04:00
PsiOmegaDelta
93e914f021
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/setup.dm
2015-07-30 10:49:37 +02:00
mwerezak
4af4e38571
Fixes #10368
2015-07-29 22:48:11 -04:00
GinjaNinja32
57e8d07085
Adds a log_and_message_admins call to cult communication rune
2015-07-28 13:29:50 +01: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
64ccd8a048
Merge pull request #10269 from Mloc/lightwrite
...
lighting work
2015-07-27 11:41:14 +09:30
PsiOmega
bd6ec4a98e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/atoms.dm
code/game/machinery/rechargestation.dm
2015-07-26 10:21:36 +02:00
PsiOmega
659b07415d
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/machinery/rechargestation.dm
code/game/mecha/equipment/tools/medical_tools.dm
maps/exodus-1.dmm
2015-07-26 10:00:12 +02:00
PsiOmega
13ca02677c
Fixes #10203 .
...
setup_economy() was previously called twice, the removed call happened before character creation.
Moves the remaining line to ensure proper setup order.
2015-07-25 14:08:19 +02:00
GinjaNinja32
006ed3ec53
Fixes typo in changeling absorbing
2015-07-24 02:35:49 +01:00
Mloc
65ac3d97d0
Revert "get rid of mob.see_in_dark and species.darksight"
...
This reverts commit 278a4c38ec
2015-07-22 15:14:40 +01:00
GinjaNinja32
0c1aee8074
Fixes <span class='class>, makes Travis check it
2015-07-18 21:13:32 +01:00
PsiOmegaDelta
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
Zuhayr
5e1ae26b74
Comment cleanup, adds TODOs for a bunch of minor things that the antag system may need to address before the end of freeze.
2015-07-14 05:19:01 +09:30
Zuhayr
cd380aba24
Removed the last few references to MODE, fixed some oversights with player_is_antag().
2015-07-14 05:19:00 +09:30
Zuhayr
7bb9ca6ec2
Fixes #10129
2015-07-14 05:18:58 +09:30
Ccomp5950
889019b445
Merge pull request #10163 from PsiOmegaDelta/150713-Fixes
...
Fixes
2015-07-13 09:35:58 -04:00
PsiOmega
750c3f9e66
Puts the world end handling inside a spawn instead of sleep.
2015-07-13 10:13:45 +02:00
GinjaNinja32
b04ed47e2f
Merge pull request #10070 from Mloc/lightwrite-2
...
Lighting overlay changes + optimizations
2015-07-12 15:51:44 +01: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
Mloc
278a4c38ec
get rid of mob.see_in_dark and species.darksight
...
They don't work with the current lighting system and cause weird artifacts.
Signed-off-by: Mloc <colmohici@gmail.com >
2015-07-09 19:17:04 +01:00
PsiOmegaDelta
0a4131e9dc
Reduced Hell Universe Lag
...
Based on https://github.com/d3athrow/vgstation13/pull/5273 .
2015-07-07 12:55:39 +02:00
PsiOmega
f96ad8ca40
NTs relationship towards you now affects the pay grade.
2015-07-02 23:03:55 +02:00
mwerezak
263f721f3e
Updates more hats
...
Also moves hat inhands to separate dmi.
2015-06-28 01:50:05 -04:00
Zuhayr
f096d5cabe
Merge resolution.
2015-06-28 06:13:24 +09:30
Zuhayr
411987c68b
Merge resolution with master.
2015-06-28 06:02:52 +09:30
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
GinjaNinja32
94ffb49bfb
Fixes certain modes not sending the 'A round of [x] has ended' notification at round-end
2015-06-26 01:04:03 +01:00
PsiOmegaDelta
fdab654beb
Grid check now respects critical APC status.
...
Fixes #9919 .
On power failure critical APCs are left alone, however on power restoration critical APCs are still included.
2015-06-25 14:12:05 +02:00
GinjaNinja32
4b5899fa30
Merge pull request #9880 from PsiOmegaDelta/150621-MeteorExAct
...
Corrects two ex_acts.
2015-06-21 13:16:23 +01:00
PsiOmegaDelta
8100f286a6
Corrects two ex_acts.
...
Decreases immovable rod severity to match other ex_acts in file.
Increases meteor gun ex_act severity.
2015-06-21 13:26:48 +02:00
Zuhayr
48cf00ca54
Merge with dev-freeze.
2015-06-21 20:45:47 +09:30
