Commit Graph

1782 Commits

Author SHA1 Message Date
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
PsiOmegaDelta
457987046b Re-implements world end events as datums. 2015-07-07 23:09:03 +02:00
PsiOmegaDelta
5703fdfe85 Re-implements admin fun events as datums. 2015-07-07 11:19:01 +02:00
PsiOmegaDelta
7f24dc948e Re-implements Admin secrets as datums. 2015-07-06 14:58:27 +02:00
PsiOmega
0adebcb2bf Admin secrets refactor.
Turns the entries in the secret admin secrets panel into datums, which will make it much easier to add, edit, and remove new entries.
This initial commit only contains an initial proof of concept entry implementation and the supporting code. Next commit will contain all relevant entries.
2015-07-05 20:56:29 +02:00
PsiOmega
5518c60daf Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-07-04 15:33:48 +02:00
PsiOmega
6e93b7d604 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/admin/verbs/deadsay.dm
2015-07-04 15:19:52 +02:00
ccomp5950
9bcc061d1f DSAY will now list that it's dsay in log instead of generic log_admin 2015-07-03 15:03:51 -04:00
PsiOmegaDelta
8c51676722 Uplink Items - Part III
Phase III of the antag uplink additions.
Currently contains proof-of-concept falsified announcements.
2015-07-03 16:02:02 +02:00
GinjaNinja32
4e6b316a9e Improved VV and callproc implementation 2015-07-02 09:26:10 +01: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
PsiOmegaDelta
8fef02501c Merge pull request #9936 from mwerezak/fire
Balances fire to work better with very low concentration phoron gas burning
2015-06-26 13:34:21 +02:00
mwerezak
9d7a1b9ad6 Fixes misleading path and proc name 2015-06-26 00:40:31 -04:00
Zuhayr
48cf00ca54 Merge with dev-freeze. 2015-06-21 20:45:47 +09:30
Zuhayr
d3bd63eec9 Refactor/tidies up latejoin antags/in-round antag spawning. 2015-06-21 19:33:49 +09:30
Zuhayr
ec5e05b9f1 Antagonist system refactor. Fixes #9495, #9290, #9521, #8800 and #9465. 2015-06-21 18:08:26 +09:30
PsiOmegaDelta
06a1ece4b8 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/ZAS/Controller.dm
	code/datums/mind.dm
	code/game/objects/items/devices/scanners.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/living/silicon/pai/pai.dm
2015-06-16 10:52:33 +02:00
PsiOmega
6373f3391f Fixes #9219.
Editing lists is now logged.
2015-06-15 18:29:07 +02:00
PsiOmega
9d90691605 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/gamemodes/wizard/spellbook.dm
2015-06-14 10:35:29 +02:00
GinjaNinja32
8d0c7039df Changes to dsay
- Adds dsay to list of +DEBUG verbs
- Changes dsay to use holder rank rather than trying to guess from rights
2015-06-13 16:46:03 +01:00
PsiOmega
d989df7e8c Adds the Jump-To-X verbs to the list of debug verbs. 2015-06-13 09:53:32 +02:00
PsiOmega
c2f8e1242e Expands admin jump permissions, cuts down on superfluous feedback. 2015-06-13 08:44:58 +02:00
PsiOmegaDelta
a0dcb04768 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/admin/player_notes.dm
	code/modules/admin/topic.dm
2015-06-11 12:06:40 +02:00
PsiOmega
2bd0d7a2f4 Automatic player note fixes.
Player notes should now properly include the relevant admin's ckey.
Automatically adds temporary and permanent bans to the player's notes.
2015-06-10 17:56:31 +02:00
PsiOmegaDelta
b7c9969f87 Corrects mob reference. 2015-06-10 11:35:00 +02:00
PsiOmegaDelta
7573ef961c Merge remote-tracking branch 'upstream/dev' into 150609-TrackEye 2015-06-10 11:16:34 +02:00
PsiOmegaDelta
75cffd60aa Merge pull request #9780 from Baystation12/dev-freeze
Dev
2015-06-10 11:15:45 +02:00
PsiOmegaDelta
b44da1ee42 Admin JMP now includes a link to EYE or BDY if any. 2015-06-10 11:08:31 +02:00
PsiOmegaDelta
e7faa19ea3 Merge pull request #9779 from Baystation12/master
Dev-freeze.
2015-06-10 11:04:54 +02:00
PsiOmega
581c9b1308 Fixes admin jumps.
Changes the checks and message target around, now targets usr instead of src.
2015-06-09 20:14:05 +02:00
Zuhayr
73146a62fe Merge pull request #9747 from PsiOmegaDelta/150608-NanoPaths
NanoUI sources can now be datums instead of atom/movable.
2015-06-09 20:08:02 +09:30
PsiOmegaDelta
0af1009b50 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-06-09 12:14:35 +02:00
PsiOmegaDelta
97f49bb982 Merge pull request #9756 from Baystation12/master
Dev-freeze
2015-06-09 12:12:40 +02:00
PsiOmegaDelta
ec68454f63 Fixes #9753.
Being admin jumped or jumping to another location now cancels ghost tracking.
Also adds proper permission checks.
2015-06-09 08:55:12 +02:00