Commit Graph

684 Commits

Author SHA1 Message Date
Fox-McCloud ff2b7cedb2 Clothing Restructuring 2015-01-02 12:40:42 -05:00
Fox-McCloud 43af351d27 Odds and Ends 2015-01-01 21:05:50 -05:00
Markolie 3f77f3ba42 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	maps/cyberiad.dmm
2014-12-23 02:50:14 +01:00
Markolie 0027425ab9 Consistency in ERT equipment, give ERT PDA's so they can be messaged privately 2014-12-23 02:36:40 +01:00
Fox-McCloud 4868d3795d Vox and Space 2014-12-09 03:47:46 -05:00
Fox-McCloud fd9d3edffb Cell Changes and other Stuff 2014-12-05 05:37:55 -05:00
SamCroswell 32661552e9 You cannot use the force, Luke! 2014-12-03 21:48:42 -05:00
SamCroswell 021bc233be Dualsword Inhand Fix, Adds Dark Lord Costume Preset 2014-12-03 21:47:12 -05:00
Fox-McCloud 72b43c3c1e Merge pull request #8 from SamCroswell/master
Dress Up Fix
2014-11-30 00:23:18 -05:00
SamCroswell 580dd00c1d Dress Up Fix 2014-11-29 23:22:59 -05:00
Markolie bd11c78235 Replace every instance of NanoTrasen with Nanotrasen. 2014-11-29 21:01:29 +01:00
Bone White 26acad361e Added Admin PM by Key verb 2014-08-05 16:38:37 +01:00
SamCroswell ace4d63a8f Minor change, testing some GH commands. 2014-07-27 08:47:29 -04:00
ZomgPonies 48be906056 Merge pull request #328 from SamCroswell/master
Added an admin verb to toggle ERTs
2014-07-26 19:15:57 -04:00
SamCroswell 075ad2a943 Added an admin verb to toggle ERTs 2014-07-26 18:04:33 -04:00
ZomgPonies b33df4745c Removed deprecated power generation stuff (AM, RUST) to free up more procs 2014-07-25 11:33:37 -04:00
d3athrow e93220cfd0 alert windows that close themselves after enough time. 2014-07-23 08:49:42 -04:00
Zuhayr 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
ZomgPonies 5d58322b0a Merge pull request #305 from SamCroswell/master
Added new eye-replacement glasses
2014-07-19 10:40:40 -04:00
SamCroswell 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
d3athrow 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
ZomgPonies 88098da3c7 Object verb removal crew 2014-07-15 08:47:43 -04:00
ZomgPonies 76276ace29 Cleaning out old unused code. 2014-07-13 08:10:44 -04:00
ZomgPonies 92940e1c00 Running tests and cleaning out useless debug verbs/procs. 2014-07-13 05:32:40 -04:00
ZomgPonies 399e4909d6 The death of assistants. Long live civilians! 2014-06-27 17:57:18 -04:00
ikarrus 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
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 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 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 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 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
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
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 f2376198ff Fix highlander clothing update maybe? 2014-05-19 06:14:55 -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
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 ef9c8875d3 IRC-AdminPM is limited to 400 characters. 2014-05-12 04:45:38 -04:00