Commit Graph

652 Commits

Author SHA1 Message Date
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
Ccomp5950 15c889f186 Code for new bots allowing admins to PM Players via IRC and vice versa.
Conflicts:
	code/modules/ext_scripts/irc.dm
2014-05-12 04:45:13 -04:00
Zuhayr 1af09fbfba Cherrypicking vox spike throwers, made crossbows and pneumatic cannons constructable.
Conflicts:
	baystation12.dme
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/modules/projectiles/guns/projectile/bow.dm
	icons/obj/gun.dmi
2014-05-12 02:59:53 -04:00
ZomgPonies e4642430d4 Compile fix 2014-05-06 01:19:56 -04:00
Ccomp5950 db072d7f4a Adds Mentors.
Adds a config option MENTORS which sets the variable config.mods_are_mentors
Adds a rights level of R_MENTOR which gets msay, private message, aghost, notes, and a new proc for checking for new players (requires database support).

If the confic option for mentors is set then

	the ckeys listed in moderators.txt file will instead be set as mentors, you can still make moderators by adding them in admins.txt

	staffwho will show Mentors instead of Moderators as the heading above the listing of non-admins.

Also:  Players now get a message gently reminding them to click the name of the staff member to reply instead of ahelping over and over.

Conflicts:
	code/game/verbs/who.dm
	code/modules/admin/admin_verbs.dm
	code/modules/admin/verbs/deadsay.dm
	config/example/config.txt
2014-05-06 01:18:36 -04:00
ZomgPonies 94308a486a Mentors can use msay 2014-05-05 23:11:28 -04:00
Ccomp5950 970525d065 Adds Mentors.
Adds a config option MENTORS which sets the variable config.mods_are_mentors
Adds a rights level of R_MENTOR which gets msay, private message, aghost, notes, and a new proc for checking for new players (requires database support).

If the confic option for mentors is set then

	the ckeys listed in moderators.txt file will instead be set as mentors, you can still make moderators by adding them in admins.txt

	staffwho will show Mentors instead of Moderators as the heading above the listing of non-admins.

Also:  Players now get a message gently reminding them to click the name of the staff member to reply instead of ahelping over and over.

Conflicts:
	code/controllers/configuration.dm
	code/game/verbs/who.dm
	code/modules/admin/admin_ranks.dm
	config-example/config.txt
2014-05-04 21:37:37 -04:00
Mloc-Argent fcdcef5931 human: move organ generation into a species proc
New proc: /datum/species/create_organs
Called in set_species when no organs exist or it's forced.
Also shuffled set_species around a bit, adding a var to human/new to
specify a species to start as.
Should fix the adminspawn vox organ runtime.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/cloning.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/organs/organ.dm
2014-04-28 21:09:45 -04:00
Rob Nelson 56d8ce28c8 Part 1 of economy rework: Spacecash refactor - See commit for full changelog.
* Implements stacking and stack overlays
 * Simplified tiers of cash (1,10,100,500,1000, may remove 500)
 * Simplified API (dispense_cash, count_cash)

Conflicts:
	code/modules/admin/admin_verbs.dm
	code/modules/admin/verbs/debug.dm
	code/modules/economy/ATM.dm
2014-04-19 20:47:41 -04:00
Rob Nelson 9227481a8a Standardize windows.
Conflicts:
	code/WorkInProgress/buildmode.dm
	code/game/machinery/doors/airlock.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/weapons/twohanded.dm
	code/game/objects/structures/window.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
	code/modules/mob/living/simple_animal/constructs.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
2014-04-19 19:36:33 -04:00
MrPerson 5bb608e56e Redo of jitteriness and dizziness.
Fixes #2923

Conflicts:
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/mecha/equipment/weapons/weapons.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/mob.dm
	code/modules/mob/mob_defines.dm
	code/modules/reagents/Chemistry-Reagents.dm
2014-02-28 22:21:33 -05:00
d3athrow 1e95f6e641 Ragin mages
Conflicts:
	config-example/config.txt
2014-02-28 19:45:02 -05:00
ZomgPonies 1358b11e46 ZAS overhaul 2014-02-22 23:10:37 -05:00
Rob Nelson 5ce97a7d25 More DNA fixes. 2014-02-07 20:56:21 -05:00
SamCroswell bd26d1b0b7 Various Pulse Rifle Fixes 2014-02-06 23:10:02 -05:00
ZomgPonies d7194e7ca0 Merge pull request #143 from SamCroswell/master
Ninja HUD/Messneger Update
2014-02-01 16:48:45 -08:00
SamCroswell 3b515d1899 Ninja HUD Implemented, Thanks Wisewill! 2014-02-01 19:36:00 -05:00
ZomgPonies 0445af4196 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-01-31 02:51:21 -05:00
Jordie0608 7ab1aac59e Outright removed toggle admin jump,spawn and revive buttons
Conflicts:
	code/controllers/configuration.dm
	code/modules/admin/admin_verbs.dm
	code/modules/admin/topic.dm
2014-01-31 02:47:04 -05:00
ZomgPonies 88ee7313b5 Merge pull request #139 from SamCroswell/master
Additional Select Equiptment Option, More Areas
2014-01-30 23:46:47 -08:00
SamCroswell 12ffdb84bd PDA icon fixes, various fixes to select equipt 2014-01-29 17:24:51 -05:00
SamCroswell 76840fae78 Additional Select Equiptment Option, More Areas 2014-01-29 17:03:14 -05:00
Zuhayr 8c5ad54e0f Recommitting a ton of files as one commit due to needing to reset this repo to an earlier point in the log. Full changes in PR.
Conflicts:
	code/game/objects/items/weapons/implants/implant.dm
	code/modules/admin/verbs/vox_raiders.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/diona.dm
	code/modules/mob/living/carbon/species.dm
2014-01-28 15:30:20 -05:00
ZomgPonies 7014f6f83e More fixes to text2speech 2014-01-27 16:58:52 -05:00
Rob Nelson 1f30243a08 Refactor the fuck out of theft objectives. No more stealing your own jumpsuit.
Conflicts:
	code/datums/mind.dm
	code/game/gamemodes/objective.dm
	code/modules/mining/money_bag.dm
	code/modules/mining/ores_coins.dm
	html/changelog.html
2014-01-24 12:16:57 -05:00
Rob Nelson 7892eeb7cc Standardize LASER, NOCLONE, and HUSK
Conflicts:
	code/game/gamemodes/changeling/changeling_powers.dm
	code/modules/mob/living/carbon/human/death.dm
	maps/RandomZLevels/wildwest.dm
2014-01-21 22:59:53 -05:00
Rob Nelson d49e6d3bf4 Standardize CLUMSY
Conflicts:
	code/game/jobs/job/civilian.dm
	code/game/objects/items/weapons/defib.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/modules/mob/living/silicon/robot/component.dm
	code/modules/reagents/reagent_containers/syringes.dm
2014-01-21 22:49:22 -05:00
Rob Nelson 6091d16262 DNA panel fixed, update changelog.
Conflicts:
	html/changelog.html
2014-01-20 11:43:07 -05:00
Rob Nelson 5f89171fc1 Hopefully fix all DNA corruption issues caused by assuming datum pass by-val.
Conflicts:
	code/modules/mob/transform_procs.dm
2014-01-20 01:52:08 -05:00
Rob Nelson 1b2d09bb2d More fixings.
Conflicts:
	code/game/machinery/computer/medical.dm
2014-01-20 01:09:03 -05:00
Rob Nelson 6013605aa6 Add back in /fail/station's DNA dickery panel, fix missing block shifting.
Conflicts:
	code/modules/admin/verbs/debug.dm
2014-01-20 01:05:52 -05:00
Rob Nelson dae08eb061 Add back in /fail/station's DNA dickery panel, fix missing block shifting.
Conflicts:
	code/modules/admin/verbs/debug.dm
2014-01-20 01:03:42 -05:00
Rob Nelson dc60cc1726 DNA modifiers work now.
Conflicts:
	code/defines/obj/hydro.dm
	code/game/machinery/cloning.dm
	code/game/machinery/hydroponics.dm
	code/modules/mob/living/carbon/zombie/zombie.dm
	code/modules/mob/transform_procs.dm
2014-01-20 00:54:46 -05:00