mwerezak
e6944b989c
Adds shuttle controller
...
Moves all ferry shuttle processing into one place: the new shuttle
controller.
Also cleans up the emergency shuttle controller a bit more and fixes
multi-shuttle cooldown.
Conflicts:
code/controllers/master_controller.dm
code/controllers/verbs.dm
code/game/supplyshuttle.dm
code/modules/shuttles/shuttle.dm
2014-06-24 07:06:48 -04:00
mwerezak
d8c02c7b6e
Some fixes
...
Conflicts:
code/game/supplyshuttle.dm
2014-06-23 11:09:14 -04:00
mwerezak
9874ce38ce
shuttle_controller now uses a shuttle datum
...
Conflicts:
code/game/machinery/computer/communications.dm
code/modules/admin/verbs/randomverbs.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/power/singularity/singularity.dm
2014-06-23 11:07:58 -04:00
ZomgPonies
3e3e4abbb5
More event fixes.
2014-06-22 04:03:08 -04:00
ZomgPonies
f8c63eaa8c
Made disable attack logs actually you know...work.
2014-06-21 16:31:09 -04:00
ZomgPonies
c6da7fdcdb
Moar Event stuff
2014-06-21 07:12:55 -04:00
ZomgPonies
65785a2ee1
Move moar shit to Event tab
2014-06-21 06:55:15 -04:00
ZomgPonies
fea9d8eda3
Switched verbs around, removed Fun tab, new Event tab for event coordinators
2014-06-21 04:37:50 -04:00
ZomgPonies
4f4a6a7ef8
NO SHOW ANTAGONIST 4 U
2014-06-20 16:31:35 -04:00
ZomgPonies
7805a61dab
Made Admin Log only show up to senior admins (+SERVER)
2014-06-20 13:50:24 -04:00
ZomgPonies
2b0d586281
Made it so if a bug report or question comes in and there's noone with the right flag on, it gets sent to anyone with r_admin instead.
2014-06-20 09:50:48 -04:00
ZomgPonies
ff87585d57
Traitor panel only for madmins
2014-06-20 05:13:47 -04:00
ZomgPonies
a5c68a80c3
Fixing +MOD permissions and awho
2014-06-20 05:08:51 -04:00
ZomgPonies
c3004f5756
Ahelp category adminpm bugfix
2014-06-20 04:44:35 -04:00
ZomgPonies
c693419a14
Mod + Admin dsay fix
2014-06-19 19:34:05 -04:00
ZomgPonies
529667a1a1
Remove that from admin verbs.
2014-06-19 19:25:04 -04:00
ZomgPonies
ea26d37fde
Quick fix for PM colors
2014-06-19 19:21:15 -04:00
ZomgPonies
a8b755da1a
Version 1 of the ahelp overhaul
2014-06-19 19:18:50 -04:00
mwerezak
a54ef207a1
Reworks shuttles to be more extensible
...
Kudos to Zuhayr for laying the groundwork for this.
Conflicts:
code/controllers/master_controller.dm
code/modules/shuttles/shuttle.dm
2014-06-14 04:13:34 -04:00
mwerezak
e9171a9ae3
Adds docking support to shuttles, NanoUI
...
Conflicts:
code/game/machinery/doors/airlock.dm
code/game/machinery/doors/airlock_control.dm
code/game/machinery/embedded_controller/docking_program.dm
code/modules/shuttles/shuttle.dm
nano/css/shared.css
2014-06-14 04:10:39 -04:00
mwerezak
629c14a66c
Adds support for different shuttle states
...
Also cleans up shuttle move states a bit.
Moves shuttle_console to it's own file
Conflicts:
code/modules/shuttles/shuttle.dm
2014-06-14 04:04:36 -04:00
Zuhayr
4385b1320c
Moved the Vox skipjack console over to a multi-destination shuttle datum setup.
...
Conflicts:
baystation12.dme
code/game/gamemodes/vox/heist/heist.dm
code/game/machinery/computer/vox_shuttle.dm
2014-06-14 02:22:11 -04:00
Zuhayr
7c442ac9a3
Added a 'controller' for shuttles (really just a data container), fixed up the admin shuttle verbs into one general verb, changed shuttles to use controller instead of populating lists at spawn.
...
Conflicts:
code/controllers/master_controller.dm
code/modules/admin/admin.dm
2014-06-14 02:10:10 -04:00
Zuhayr
689110af1d
Some cleanup stuff for prior commits.
2014-06-14 02:01:58 -04:00
Zuhayr
e4b95aa05e
Moved engineering, research and mining shuttles to a generalized system with its own directory structure.
...
Conflicts:
baystation12.dme
code/modules/mining/mine_items.dm
code/modules/research/research_shuttle.dm
2014-06-14 02:01:14 -04:00
ZomgPonies
4b8f0020d6
Trying to fix people not hearing radio?
2014-06-03 22:52:12 -04:00
ZomgPonies
048ac0994d
2nd commit of MySQL conversion. So close to the finish line.
2014-06-03 03:31:06 -04:00
ZomgPonies
113f98a9e1
Post test #4 fixes
2014-05-29 09:52:58 -04:00
mwerezak
cb5ffe6d2c
Forgot to add VV menu entry for give_disease2
2014-05-26 06:12:21 -04:00
mwerezak
9934a32cd3
Fixes #4889
2014-05-26 06:12:10 -04:00
ZomgPonies
11a1deb1ac
Trying to cut down on attack lock spam
2014-05-24 17:17:38 -04:00
ZomgPonies
6faa9e3be9
Forgot this
2014-05-23 02:18:41 -04:00
ZomgPonies
a521f88e95
Final dodgeball fixes
2014-05-23 01:15:24 -04:00
ZomgPonies
cbd1148d12
Every round ender needs a good theme song. TODO: Switch all these to play from a global jukebox in streaming.
2014-05-23 00:06:46 -04:00
Mloc-Argent
1b2f83dee4
BS12 Hooks
2014-05-22 23:56:35 +02:00
ZomgPonies
a2a50586b0
Trying to fix dodgeball
2014-05-22 15:49:34 -04:00
ZomgPonies
342f8c4042
Fixed up Highlander and Dodgeball
2014-05-22 14:21:29 -04:00
Regen
3959cbd634
Changed color of Asay to a more notable one
2014-05-20 23:18:29 +02:00
ZomgPonies
7bf3f18cce
Renamed Atmos Tech to life support specialist due to new grav gen responsabilities
2014-05-20 22:59:24 +02:00
alex-gh
54db12f702
Merge pull request #206 from alex-gh/mutiny_fixes
...
Merged latest mutiny fixes.
2014-05-19 19:56:10 +02:00
alex-gh
4dc1e5c0b3
Merged latest mutiny fixes.
2014-05-19 19:54:42 +02:00
ZomgPonies
f2376198ff
Fix highlander clothing update maybe?
2014-05-19 06:14:55 -04:00
jack-fractal
fd4cd0007c
fixing the player panel to work with spirits and masks
...
Conflicts:
code/modules/admin/player_panel.dm
code/modules/mob/mob_helpers.dm
2014-05-17 01:22:13 -04:00
jack-fractal
05da6ed973
adding modifications to cult mode, working spirits, and mask transformation procs
...
Conflicts:
code/game/gamemodes/cult/runes.dm
code/modules/mob/mob.dm
code/modules/mob/mob_movement.dm
2014-05-15 05:16:13 -04:00
jack-fractal
3df35fe03c
modifying visibility interface of ai to use generic visibility_interface
...
Conflicts:
baystation12.dme
code/game/gamemodes/malfunction/Malf_Modules.dm
code/modules/mob/living/silicon/ai/freelook/cameranet.dm
code/modules/mob/living/silicon/ai/freelook/chunk.dm
code/modules/mob/living/silicon/ai/freelook/eye.dm
code/modules/mob/living/silicon/ai/freelook/update_triggers.dm
2014-05-15 04:43:49 -04:00
Jeremy Liberman
bd249e3a53
Mutiny Mode
...
Conflicts:
code/__HELPERS/time.dm
code/controllers/hooks-defs.dm
code/controllers/hooks.dm
code/game/machinery/computer/card.dm
code/game/machinery/podmen.dm
code/modules/admin/player_panel.dm
code/modules/client/preferences.dm
code/modules/mob/living/carbon/brain/brain_item.dm
code/modules/mob/living/carbon/human/death.dm
code/modules/mob/living/login.dm
code/modules/mob/mob.dm
code/modules/security levels/keycard authentication.dm
code/setup.dm
icons/mob/mob.dmi
2014-05-15 01:01:54 -04:00
ZomgPonies
66d9ba3fb8
Fixing up vox and vox armalis gear
2014-05-14 22:24:34 -04:00
Rob Nelson
9d53cfa446
Moved Vox DMI to a subfolder, added species-based random-naming, fixed preview.
...
Tested.
Conflicts:
code/game/gamemodes/vampire/vampire_powers.dm
code/game/gamemodes/vox/heist/heist.dm
code/modules/admin/verbs/one_click_antag.dm
code/modules/events/heist.dm
code/modules/mob/living/carbon/species.dm
code/modules/mob/mob.dm
code/modules/mob/new_player/new_player.dm
code/modules/mob/new_player/preferences_setup.dm
2014-05-14 04:32:18 -04:00
Ccomp5950
1944048870
Canceling an IRC-adminPM will not send a blank message.
...
Ooops
2014-05-12 04:49:03 -04:00
Ccomp5950
327af807c1
You can now request player notes through IRC bots.
...
Conflicts:
code/world.dm
2014-05-12 04:48:32 -04:00
