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
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
e350d888e6
Fixes #10217 .
...
Adds destroys to rectify the situation.
2015-08-09 10:52:24 +02:00
PsiOmegaDelta
3e266ab377
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-05 09:25:53 +02:00
PsiOmegaDelta
6b01a67c50
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/admin/admin_verbs.dm
code/modules/nano/interaction/default.dm
2015-08-05 09:16:50 +02:00
GinjaNinja32
c71d78ab1a
add debug verb as pAI-spawning adminverb
2015-08-05 00:50:04 +01:00
PsiOmegaDelta
93011f94c4
Merge pull request #10425 from Baystation12/dev-freeze
...
Dev
2015-08-04 13:07:11 +02:00
mwerezak
76ceaa904b
Fixes admin or event spawned antags not spawning
...
Pending players were selected but the antag roles were never finalized.
2015-08-03 12:06:23 -04:00
PsiOmega
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
PsiOmegaDelta
f8799035f4
Merge pull request #10400 from Baystation12/master
...
Master -> Dev-Freeze
2015-08-01 19:44:22 +02:00
GinjaNinja32
495f80fff6
Change callproc to check validity earlier
...
Callproc now checks validity of a call *before* prompting for arguments, instead of after, and can now check the validity of global (/proc/foo) procs.
2015-08-01 17:19:36 +01:00
PsiOmegaDelta
93e914f021
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/setup.dm
2015-07-30 10:49:37 +02:00
PsiOmegaDelta
b6bd51828a
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/robot/robot_upgrades.dm
code/modules/admin/admin_verbs.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Recipes.dm
code/modules/reagents/reagent_containers/syringes.dm
2015-07-30 10:38:44 +02:00
PsiOmegaDelta
f49d8d5e54
Merge pull request #10352 from Baystation12/dev-freeze
...
Dev freeze
2015-07-29 12:16:23 +02:00
PsiOmega
0e8ca3c82c
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/admin/player_notes.dm
2015-07-29 11:57:17 +02:00
GinjaNinja32
84c7625490
Chemical logging improvements
2015-07-29 07:55:30 +01:00
Chinsky
0a54797044
Merge pull request #10341 from GinjaNinja32/notes-format
...
Changes show_player_info_irc to properly escape '%'
2015-07-28 14:02:08 +03:00
GinjaNinja32
09a8f37d6c
Changes show_player_info_irc to properly escape '%'
2015-07-28 10:59:51 +01:00
PsiOmegaDelta
0ab507ccec
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2015-07-28 09:03:49 +02:00
PsiOmegaDelta
0bf3c39095
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2015-07-28 07:59:49 +02:00
GinjaNinja32
40693fda5b
Merge pull request #10335 from PsiOmegaDelta/150727-SpawnLog
...
Adds admin message log to the spawn verb.
2015-07-27 10:54:40 +01:00
PsiOmegaDelta
81c40c14b1
Compacts down the game panel spawn logging and makes it always notify admins.
2015-07-27 11:47:55 +02:00
PsiOmegaDelta
631c30732d
Adds admin message log to the spawn verb.
...
The spawn-verb no longer only makes an entry in the admin log but also messages admins, making it less sneaky.
2015-07-27 11:24:44 +02: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
GinjaNinja32
0e71efea18
Changes player planel to always display key if present
2015-07-26 11:03:36 +01:00
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
Snapshot
a13467d8a4
Merge pull request #10286 from comma/tor
...
Updates ToR list URL
2015-07-24 17:31:15 -07:00
Chinsky
0753429740
Updates ToR list URL
2015-07-25 03:27:46 +03: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
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
GinjaNinja32
efaf8659b8
Fixes usage of isAI()
2015-07-15 15:51:11 +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
GinjaNinja32
b04ed47e2f
Merge pull request #10070 from Mloc/lightwrite-2
...
Lighting overlay changes + optimizations
2015-07-12 15:51:44 +01: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
Null Snapshot
5b30703d30
Should be the last fixes needed.
2015-07-11 04:22:36 -07:00
Null Snapshot
168f823c35
Fixed up the things pointed out by Ccomp5950.
2015-07-09 22:19:05 -07:00
Null Snapshot
49ea79d0b3
Added missing return.
2015-07-09 14:40:30 -07:00
Null Snapshot
87c8be10dd
spans and grammar for topic.dm
2015-07-09 12:26:32 -07:00
Null Snapshot
909798a8ef
Actual implementation of mod_can_(job_)tempban and mod_(job_)tempban_max
2015-07-09 12:11:27 -07: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
df83203356
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/hydroponics/seed_mobs.dm
code/modules/materials/materials.dm
2015-07-09 08:45:49 +02:00
PsiOmegaDelta
14acf43646
Merge pull request #10059 from Baystation12/master
...
Dev-freeze
2015-07-09 08:34:43 +02:00
ccomp5950
0f764d8779
Admins will no longer see stars when viewing faxes.
...
If an admin wasn't human / ghosting / or a silicon mob they would see garbled text.
This uses the "force view" setting to 1 bypassing the check.
Fixes #10050
2015-07-08 10:47:22 -04:00
