Commit Graph

2792 Commits

Author SHA1 Message Date
Ccomp5950 b0b7953af7 Mentor changes.
Mentors no longer see stealthmins
Mentors no longer see antagonists / have check_antagonist verbs
New debug verb:  Reload Mentors (or mods)
2014-06-01 13:51:49 -05:00
Mloc-Argent 3d2cc3cd82 Revert "Merge pull request #4985 from jack-fractal/dev"
This reverts commit 1679b4062f, reversing
changes made to b149b273d9.

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

Conflicts:
	code/datums/visibility_networks/update_triggers.dm
2014-05-31 00:25:56 +01:00
Mloc-Argent ee2e68960a Merge remote-tracking branch 'upstream/master' into dev-freeze
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/cloning.dm
	code/modules/admin/admin_verbs.dm
2014-05-31 00:17:56 +01:00
Ccomp5950 4bb59352f5 Merge pull request #4968 from MrLeebo/mutiny
Mutiny Mode
2014-05-28 00:13:42 -05:00
Ravensdale abdadd35b4 Updates most used viable entries of t cet to Nyx 2014-05-26 15:58:16 -07:00
mwerezak d5b22e9125 Forgot to add VV menu entry for give_disease2 2014-05-24 12:14:16 -04:00
mwerezak 2c3ecc78d5 Fixes #4889 2014-05-24 11:54:55 -04:00
Jeremy Liberman a95a28e303 Merge branch 'dev' into mutiny-fixes 2014-05-18 11:25:36 -05:00
Jeremy Liberman 5f025b630a Mutiny fixes; add sanity checks, prevent recruitment spam, fix pinpointer description, fix overlays when changing teams, and convert indents to tabs 2014-05-18 11:05:04 -05:00
Zuhayr 1679b4062f Merge pull request #4985 from jack-fractal/dev
Masks of Nar'sie - Testing Version
2014-05-17 14:01:00 +09:30
Zuhayr 04315c1d43 Merge pull request #5001 from Intercross21/dev
More nice looking give spell/disease interface
2014-05-17 10:42:31 +09:30
jack-fractal bd3eeca855 fixing the player panel to work with spirits and masks 2014-05-16 19:19:22 -04:00
Intercross21 e6efa81c77 More nice looking give spell/disease interface 2014-05-15 22:03:16 +04:00
jack-fractal 1bd866239f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mask-storage
Conflicts:
	code/datums/mind.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/doors/door.dm
2014-05-13 20:45:05 -04:00
Jeremy Liberman d23340a49b Mutiny Mode 2014-05-11 15:03:50 -05:00
Mloc-Hibernia f2924c9f57 Merge remote-tracking branch 'upstream/dev' into bs12-zuhweapons 2014-05-11 13:48:51 +00:00
Mloc-Hibernia e3a8d5eb43 Merge remote-tracking branch 'upstream/master' into dev
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/objects/effects/spawners/bombspawner.dm
2014-05-11 13:19:09 +00:00
Zuhayr 85279c97c4 Added toggle verb for drones. 2014-05-11 22:00:34 +09:30
Zuhayr 5e682668b2 Cherrypicking vox spike throwers, made crossbows and pneumatic cannons constructable. 2014-05-10 02:10:06 +09:30
Ccomp5950 e4089f2fd0 Re-adds Show Player Panel right click menu on players. 2014-05-09 05:41:43 -05:00
Mloc-Argent 2d99a65cdf Merge remote-tracking branch 'upstream/master' into dev 2014-05-08 19:27:02 +01:00
Ccomp5950 37e33cba9a AdminPM fixes
Invisimins won't show what their rank is it will simply say "Admin"

Non-staff won't get to see the adminlink (?)

People receiving adminPM's won't get the wrong version of it allowing them to only reply to themselves.

Removed the commented out stuffs.
2014-05-07 13:56:25 -05:00
Mloc-Argent a2b85c31a4 Merge remote-tracking branch 'upstream/master' into dev 2014-05-07 17:37:29 +01:00
Zuhayr 0d597fe8db Merge pull request #4912 from Ccomp5950/mentors
Adds Mentors.
2014-05-07 10:00:27 +09:30
Mloc-Argent 6a11ca32f8 Merge remote-tracking branch 'upstream/master' into dev 2014-05-05 22:22:01 +01:00
Intercross21 0e40a3f2dd And little more fixes 2014-05-05 19:38:09 +04:00
Intercross21 cef243188a AH with link 2014-05-05 19:25:50 +04:00
Ccomp5950 fe4f9b0df9 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.
2014-05-04 23:12:06 -05:00
Intercross21 d4ee83666e Now AH shows key, prefs.jobs not have scrollbar, prefs is fully visible except undo/save menus. 2014-05-04 19:41:14 +04:00
Intercross21 11e5c64c78 Unified interface for options of admin 2014-05-04 18:37:42 +04:00
Intercross21 02ce933297 Larger job and preferences windows but still lesser than 764. More choices in "Quick Create Object" menu. 2014-05-04 18:11:11 +04:00
Mloc-Argent e1ddec4a73 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/game/area/Space Station 13 areas.dm
	code/game/objects/items/weapons/manuals.dm
	code/modules/mob/living/say.dm
	code/modules/organs/organ_internal.dm
	code/modules/paperwork/paper.dm
	code/modules/supermatter/supermatter.dm
	html/changelog.html
	icons/mob/uniform.dmi

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-05-03 16:56:19 +01:00
Ccomp5950 ed25b7c870 Canceling an IRC-adminPM will not send a blank message.
Ooops
2014-05-03 09:27:59 -05:00
Mloc f0726e5cee Merge pull request #4881 from Ccomp5950/botfix
Admin empowerment:  Allowing Admins in IRC to respond to ahelps
2014-05-03 11:04:43 +01:00
Ccomp5950 0c0af93601 You can now request player notes through IRC bots. 2014-05-02 08:16:47 -05:00
Ccomp5950 d6717177ad IRC-AdminPM is limited to 400 characters. 2014-05-01 21:24:09 -05:00
Ccomp5950 44578b7832 Deadlier supermatter. If you don't add coolant, you will have a bad time.
Before:  Supermatter would raise the temperature without taking into account how many moles it grabbed in it's "breath" meaning it was better that you had a lower pressure inside your engine chamber so the engine would spit back out it's "breath" and it couldn't heat up the engine room as much.

Now:	Supermatter will take into account the heat_capacity of the breath it takes and will heat up it up accordingly and proportional to how much energy it has.

Gone are the days you could run the supermatter engine without adding coolant.

Also:  Added a debugverb that setups the engine for you, the verb is based off of baystations map and areas and shouldn't require too much change to bring it in line for other servers.
2014-04-28 11:42:48 -05:00
suethecake 2b2d64f05f Initial commit containing all the necessary code files that allow Tajaran, Unathi, and Skrell to change both their hair and body color to match. NO MORE GREEN/GREY! 2014-04-27 01:00:16 -06:00
Ccomp5950 b2d03d67a0 Merge pull request #4819 from Mloc/bs12-itemorgans
human: move organ generation into a species proc
2014-04-25 15:33:34 -05:00
Ccomp5950 dada7f1d96 Merge pull request #4767 from comma/master
has_reagents baguette
2014-04-22 17:02:03 -05:00
Ravensdale a72f8d3ded Spelling correction: tratior and Tratior to traitor and Traitor 2014-04-22 01:12:17 -07:00
Chinsky 58430c03a7 Lets everyone delete AdminBot's notes.
Fuck robot rights.
2014-04-18 23:25:21 +04:00
Mloc-Argent 28a57a1029 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>
2014-04-18 10:44:21 +01:00
Ccomp5950 daed8dd7ec Code for new bots allowing admins to PM Players via IRC and vice versa. 2014-04-16 23:14:17 -05:00
Ravensdale 1d6655850f Changes all appropriate instances of toxins to phoron 2014-04-10 15:11:26 -07:00
Ravensdale a3e4a43536 Changes most viable, used entries of plasma with phoron. 2014-04-10 05:05:04 -07:00
Ravensdale e6c3fbf071 Changes all appropriate instances of 'Plasma' to 'Phoron' 2014-04-10 01:19:49 -07:00
Ccomp5950 56ef5c165c Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/modules/reagents/reagent_containers/food/cans.dm
2014-03-28 18:46:04 -05:00
Ccomp5950 936db263ef *NIX Log files part 2.
CR+LF added to new lines, created a global variable log_end that can be used
on newlines

log_misc("blahblah...[log_end]\nMoreblahblah[log_end]")

put [log_end] prior to any \n and it will show up correctly in windows.

Also created log_misc() proc to log to diary, and removed a bunch of

diary << stuff all over the place.
2014-03-26 18:51:37 -05:00
Ccomp5950 7000cce408 Admin Request: Logs now will end in CRLF on unix systems.
Also removed the "SERVER HAS CALLED FOR A VOTE" spam
2014-03-23 02:26:06 -05:00