ace4d63a8f
Minor change, testing some GH commands.
2014-07-27 08:47:29 -04:00
48be906056
Merge pull request #328 from SamCroswell/master
...
Added an admin verb to toggle ERTs
2014-07-26 19:15:57 -04:00
075ad2a943
Added an admin verb to toggle ERTs
2014-07-26 18:04:33 -04:00
acbaa31194
Enables the "cult" investigation
...
Exactly as the name says. Makes use of all the investigate_log in place for cult
2014-07-25 11:57:13 -07:00
dc56dc8958
Investigate PDA messages
2014-07-25 12:32:35 -04:00
b33df4745c
Removed deprecated power generation stuff (AM, RUST) to free up more procs
2014-07-25 11:33:37 -04:00
431ab486b3
Made all current wizard + genetic spells a subtype of spell/wizard (Since they use the same action button row)
2014-07-23 11:04:07 -04:00
800d5b4b0b
Revert "Made wizard spells into various subtypes"
...
This reverts commit 8b703f55af
2014-07-23 10:58:20 -04:00
e93220cfd0
alert windows that close themselves after enough time.
2014-07-23 08:49:42 -04:00
992ceecd4e
NanoUI updates.
...
* Map gen verb is now limited to those with server access.
* Added Z layer support.
Conflicts:
code/modules/admin/admin_verbs.dm
nano/images/nanomap.png
2014-07-21 18:54:19 -04:00
8b703f55af
Made wizard spells into various subtypes
2014-07-21 09:40:42 -04:00
7c07240ac9
Integrated crossbows/pneumatic cannons into launcher gun type, added back sprites.
...
Conflicts:
code/modules/projectiles/gun.dm
code/modules/projectiles/guns/alien.dm
code/modules/projectiles/guns/projectile/crossbow.dm
code/modules/projectiles/guns/projectile/pneumatic.dm
icons/mob/back.dmi
maps/tgstation2.dmm
2014-07-21 06:10:45 -04:00
4e1d24609f
Fireball explosion fixes
2014-07-20 04:31:32 -04:00
5d58322b0a
Merge pull request #305 from SamCroswell/master
...
Added new eye-replacement glasses
2014-07-19 10:40:40 -04:00
72f4607fad
Added new eye-replacement glasses
...
These aren't intended for everyday use, I plan to incorporate them into
future events.
2014-07-19 02:17:20 -04:00
60b0659d43
Made update_power be at mob level since spells are at that level.
2014-07-18 12:11:13 -04:00
994a5bebbf
Fix admins having to toggle genes several fucking times to get them to turn on sometimes.
...
Fix adminbus toggling genes on to cause all other genes to manifest - added genemutcheck proc and domutation proc to handle the changes.
Added a global list of gene datums that match the order of the randomized blocks in genetics to allow for easy lookup based on blocks and allows single gene checking to work.
Conflicts:
code/game/gamemodes/setupgame.dm
code/modules/admin/verbs/debug.dm
2014-07-17 05:27:05 -04:00
aafa11712a
Removal of virus1/disease1 system. So long GBS/Jungle Fever, you'll be missed!
2014-07-16 00:53:08 -04:00
88098da3c7
Object verb removal crew
2014-07-15 08:47:43 -04:00
c54b9e3626
Slime update
...
Conflicts:
baystation12.dme
code/modules/mob/living/carbon/metroid/death.dm
code/modules/mob/living/carbon/metroid/metroid.dm
code/modules/mob/living/say.dm
code/modules/mob/transform_procs.dm
code/modules/reagents/Chemistry-Recipes.dm
maps/tgstation2.dmm
2014-07-15 00:50:41 -04:00
333c3c8ae7
Mining rework. Added ore scanner, adjusted values for spawn, added debug verbs.
...
Conflicts:
baystation12.dme
code/modules/admin/admin_verbs.dm
maps/tgstation2.dmm
2014-07-13 08:44:47 -04:00
76276ace29
Cleaning out old unused code.
2014-07-13 08:10:44 -04:00
40c6508ccb
long_jump() now uses an arrive_time var instead of sleeping the whole time.
...
Makes ETAs more accurate, allows the possibility of interrupting
long_jumps in the future.
Conflicts:
code/modules/shuttles/shuttle.dm
2014-07-13 06:05:29 -04:00
92940e1c00
Running tests and cleaning out useless debug verbs/procs.
2014-07-13 05:32:40 -04:00
399e4909d6
The death of assistants. Long live civilians!
2014-06-27 17:57:18 -04:00
cb9b6fca4d
Replacing civilian with support department. Still need to make changes on MySQL schema.
2014-06-26 19:42:14 -04:00
f5f4682b8e
Updates secrets panel to use the new shuttle...
...
...datum correctly.
Conflicts:
code/modules/admin/admin.dm
2014-06-26 16:58:07 -04:00
c9dd900ebf
The Select-Equipment admin verb now includes all jobs
...
Useful for admins and coders alike.
Conflicts:
code/modules/admin/verbs/debug.dm
2014-06-25 08:32:52 -04:00
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
d8c02c7b6e
Some fixes
...
Conflicts:
code/game/supplyshuttle.dm
2014-06-23 11:09:14 -04:00
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
3e3e4abbb5
More event fixes.
2014-06-22 04:03:08 -04:00
f8c63eaa8c
Made disable attack logs actually you know...work.
2014-06-21 16:31:09 -04:00
c6da7fdcdb
Moar Event stuff
2014-06-21 07:12:55 -04:00
65785a2ee1
Move moar shit to Event tab
2014-06-21 06:55:15 -04:00
fea9d8eda3
Switched verbs around, removed Fun tab, new Event tab for event coordinators
2014-06-21 04:37:50 -04:00
4f4a6a7ef8
NO SHOW ANTAGONIST 4 U
2014-06-20 16:31:35 -04:00
7805a61dab
Made Admin Log only show up to senior admins (+SERVER)
2014-06-20 13:50:24 -04:00
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
ff87585d57
Traitor panel only for madmins
2014-06-20 05:13:47 -04:00
a5c68a80c3
Fixing +MOD permissions and awho
2014-06-20 05:08:51 -04:00
c3004f5756
Ahelp category adminpm bugfix
2014-06-20 04:44:35 -04:00
c693419a14
Mod + Admin dsay fix
2014-06-19 19:34:05 -04:00
529667a1a1
Remove that from admin verbs.
2014-06-19 19:25:04 -04:00
ea26d37fde
Quick fix for PM colors
2014-06-19 19:21:15 -04:00
a8b755da1a
Version 1 of the ahelp overhaul
2014-06-19 19:18:50 -04:00
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
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
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
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
SamCroswell