b7c95f9c00
Merge pull request #10880 from Baystation12/dev-freeze
...
Dev freeze
2015-08-26 03:22:06 +09:30
f4d27e8b1c
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/modules/admin/verbs/adminsay.dm
2015-08-26 03:09:11 +09:30
09f1c6054b
Changed MSAY to show the ckey/character name like it does with asay
2015-08-23 20:27:56 -04:00
3bfa541612
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-22 02:10:11 +09:30
c8b6813426
Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery
...
Uplink Items - Part III
2015-08-20 19:19:12 +09:30
a8dc3a282b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into turfs
2015-08-18 12:06:53 -07:00
a896991657
Even comments need matching spans for Travis to pass.
2015-08-18 11:55:43 -07:00
71214d859e
Merge with master.
2015-08-18 11:31:10 -07:00
f0c8db3d0f
Adds settable rank to IRC messages, changes it so non-admins can see who on IRC is messaging them, and adds the name of the original sender to reply PMs
2015-08-18 02:16:50 +01:00
c8baafed2a
Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and
...
construction/deconstruction. Major map rework/changes.
2015-08-16 06:05:21 -07:00
db565ae2ff
Merge remote-tracking branch 'upstream/dev' into 150703-Uplinkery
...
Conflicts:
code/datums/datacore.dm
code/defines/obj.dm
2015-08-13 08:11:32 +02:00
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
8c0984d5b1
Fix gender issues, some typos from various files
2015-08-11 13:41:40 +03:00
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
e350d888e6
Fixes #10217 .
...
Adds destroys to rectify the situation.
2015-08-09 10:52:24 +02:00
93011f94c4
Merge pull request #10425 from Baystation12/dev-freeze
...
Dev
2015-08-04 13:07:11 +02:00
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
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
f8799035f4
Merge pull request #10400 from Baystation12/master
...
Master -> Dev-Freeze
2015-08-01 19:44:22 +02:00
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
9e46dfbb56
Re-arranges data record and crew arrival announcement code.
2015-07-28 11:27:44 +02:00
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
65ac3d97d0
Revert "get rid of mob.see_in_dark and species.darksight"
...
This reverts commit 278a4c38ec
2015-07-22 15:14:40 +01:00
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
cd380aba24
Removed the last few references to MODE, fixed some oversights with player_is_antag().
2015-07-14 05:19:00 +09:30
7bb9ca6ec2
Fixes #10129
2015-07-14 05:18:58 +09:30
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
5518c60daf
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-07-04 15:33:48 +02:00
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
9bcc061d1f
DSAY will now list that it's dsay in log instead of generic log_admin
2015-07-03 15:03:51 -04:00
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
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
9d7a1b9ad6
Fixes misleading path and proc name
2015-06-26 00:40:31 -04:00
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
6373f3391f
Fixes #9219 .
...
Editing lists is now logged.
2015-06-15 18:29:07 +02:00
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
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
c2f8e1242e
Expands admin jump permissions, cuts down on superfluous feedback.
2015-06-13 08:44:58 +02:00
7573ef961c
Merge remote-tracking branch 'upstream/dev' into 150609-TrackEye
2015-06-10 11:16:34 +02:00
75cffd60aa
Merge pull request #9780 from Baystation12/dev-freeze
...
Dev
2015-06-10 11:15:45 +02:00
b44da1ee42
Admin JMP now includes a link to EYE or BDY if any.
2015-06-10 11:08:31 +02:00
e7faa19ea3
Merge pull request #9779 from Baystation12/master
...
Dev-freeze.
2015-06-10 11:04:54 +02:00
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
0af1009b50
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-06-09 12:14:35 +02:00
97f49bb982
Merge pull request #9756 from Baystation12/master
...
Dev-freeze
2015-06-09 12:12:40 +02:00
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
a07d20d657
Ports /tg/'s meteor implementation.
...
Merges the two meteor events into one, and now takes severity into consideration instead.
Including the basic meteors there are also new types ranging from flaming to radioactive which may drop appropriate types of ore.
2015-06-05 14:58:35 +02:00
00953968dd
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-06-04 08:20:00 +02:00
6c903907c0
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-06-04 08:10:49 +02:00
086517f988
Closes a span class.
...
Has somehow gone unnoticed until now.
2015-06-03 17:57:57 +02:00
Zuhayr