Commit Graph

56 Commits

Author SHA1 Message Date
Fox-McCloud
62fb3c2981 Safe Cleanup and Fix 2015-09-29 11:31:57 -04:00
Markolie
9adff714b9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into sql
Conflicts:
	code/controllers/configuration.dm
	config/example/config.txt
2015-09-23 07:07:17 +02:00
Markolie
2b7fda8a47 SQL based memos 2015-09-23 05:08:28 +02:00
Markolie
279c998ae8 OOC/LOOC update, stealthmin fixes 2015-09-17 21:27:24 +02:00
Markolie
be55c0d0d5 Add custom styling to cult messages 2015-09-01 20:02:42 +02:00
Mark van Alphen
a762491eb4 Merge pull request #1839 from Fox-McCloud/gutter
Gutter Language Update
2015-08-25 18:49:46 +02:00
KasparoVy
06ead88f81 Makes Sinta'Unathi Easier to See
Made the text colour of the Unathi native language Sinta'Unathi 3 shades darker, a lot easier to tell apart from the standard radio.
2015-08-24 21:54:54 -04:00
Fox-McCloud
146ded3521 Gutter Language Update 2015-08-24 02:45:38 -04:00
DZD
36221a3c69 Update to tgstation/-tg-station#10254 2015-07-31 11:31:21 -04:00
Fox-McCloud
791ebc0b7f New Race: Canine Race--Vulpkanin 2015-05-24 01:00:19 -04:00
DZD
139f928a2e Changes, hellish runtimes
- Shadowling hivemind is a language
- Fixes shadowling HUD
- Changes to gamemode to allow for testing.
- Creates runtimes because BYOND is shit.
2015-04-29 19:28:42 -04:00
DZD
e916de60a1 Ports tgstation/-tg-station#8927.
And fixes a few other things.
2015-04-23 12:25:18 -04:00
DZD
0ab3a54fcb Copy-Paste Port of /tg/station's Shadowlings
Ports tgstation/-tg-station#8157

This won't compile, needs to be bugfixed and tested. The only reason I
am PRing  this right now is so that we don't have multiple people
working on the same thing.

@ZomgPonies This will require PROBABILITY SHADOWLING # to be added to
game_options.txt, and will likely require SQL database additions for the
BE_SHADOWLING antag preference.
2015-04-12 13:15:40 -04:00
Tigercat2000
65623a8f36 Update missing -tg- stylesheet entries 2015-03-31 15:34:10 +02:00
Markolie
3f51486ba4 Bug fixes, bot proces controller update 2015-02-24 01:40:43 +01:00
ZomgPonies
ad8d879349 Adds a public clown language 2015-02-21 09:37:45 -05:00
ZomgPonies
dcac7166d8 Meh! 2015-02-20 18:51:50 -05:00
ZomgPonies
cfd9c09f0a Adds COMIC mutation and gives it to clown 2015-02-20 18:43:09 -05:00
Markolie
d8d1670b68 Revert "Revert "Saycode/language/species port from Bay""
This reverts commit d54579850c.

Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/objects/items/devices/radio/intercom.dm
	code/modules/mob/living/silicon/pai/pai.dm
2015-02-20 17:46:35 +01:00
ZomgPonies
d54579850c Revert "Saycode/language/species port from Bay" 2015-02-19 20:15:42 -05:00
Markolie
21926c9e48 Part 1 of saycode/language/species port from Bay 2015-02-17 23:20:50 +01:00
Markolie
37b86cd8f1 Xenos gamemode rework 2014-12-13 02:08:22 +01:00
Markolie
0dc52900cc Adds the service channel (:v) 2014-11-29 21:01:19 +01:00
ChuckTheSheep
7491cd7b65 TC use count appears on round end
Conflicts:
	code/datums/uplink_item.dm
	code/game/objects/items/devices/uplinks.dm

Adds Icons and purchase list

Conflicts:
	code/datums/uplink_item.dm
	code/game/gamemodes/traitor/traitor.dm
	code/stylesheet.dm

CSS is hard

Conflicts:
	code/game/gamemodes/traitor/traitor.dm

Mah Indents

Made Purchase Log Text rather than List

Conflicts:
	code/game/objects/items/devices/uplinks.dm

Moved images to top "survived" line

Conflicts:
	code/game/objects/items/devices/uplinks.dm

Boxes show contents

Nuke Ops Group Shaming

Conflicts:
	code/game/gamemodes/nuclear/nuclear.dm

Uses compiled list for uplinks

Conflicts:
	code/game/objects/items/devices/uplinks.dm
2014-05-30 20:28:35 +02:00
Regen
7c710186e2 Armalis bugfixes
Also slightly changed admin chat color again
2014-05-22 18:57:33 +02:00
Regen
3959cbd634 Changed color of Asay to a more notable one 2014-05-20 23:18:29 +02:00
GinjaNinja32
032f6fb762 Add colour to AI private channel (144.7)
Changes the AI private channel colour to magenta (#ff00ff), and changes
the marker from [144.7] to [AI Private].

Magenta is far enough from the Science channel (#993399) to be obvious,
but I'm open to alternative suggestions.

Conflicts:
	code/stylesheet.dm
2014-04-19 15:44:48 -04:00
ZomgPonies
ee85462e08 Fuck fonts forever always 2014-02-28 16:03:49 -05:00
ZomgPonies
fc7e9a594d Font changes 2014-02-28 15:43:50 -05:00
ZomgPonies
f545101e87 Merge branch 'font'
Conflicts:
	code/modules/client/client procs.dm
	code/stylesheet.dm
	fonts/skrell.ttf
	fonts/slime.ttf
2014-02-28 15:26:59 -05:00
ZomgPonies
77417edf6e Revert "New fonts work first iteration"
This reverts commit 172a4dfc51.
2014-02-04 02:47:14 -05:00
ZomgPonies
0b86695573 Broken font shit? 2014-02-04 02:29:50 -05:00
ZomgPonies
172a4dfc51 New fonts work first iteration 2014-02-04 00:54:24 -05:00
Pete Goodfellow
331cf1df95 Updated all suicide_act()s to use a new span class, 'suicide'.
Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/game/objects/items/weapons/melee/misc.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/items/weapons/weaponry.dm
	code/modules/hydroponics/growninedible.dm
	code/modules/hydroponics/hydroitemdefines.dm
	code/modules/surgery/tools.dm
	code/stylesheet.dm
2014-01-19 21:25:47 -05:00
ZomgPonies
d40ebc5cc5 Revert "Tradeband and Gutterspeak now have a different font than Tradeband."
This reverts commit b5906bba39.

Conflicts:
	code/modules/mob/living/carbon/human/human.dm
2014-01-15 06:54:46 -05:00
SkyMarshal
b5906bba39 Tradeband and Gutterspeak now have a different font than Tradeband.
Fixes #4143

Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/new_player/new_player.dm
2014-01-09 21:05:36 -05:00
Kilakk
e9b8269e13 Adds colored department radio channels. 2013-07-30 17:38:34 -04:00
Mloc-Argent
cf53dd7a10 Revert "Adds in the Kida"
This reverts commit a2fddc0fc1.
2013-07-12 12:22:35 +01:00
NicholasDV
a2fddc0fc1 Adds in the Kida
Adds in the Kida Race to all parts.
2013-06-13 18:22:05 -04:00
Zuhayr
06f04e6374 Vox mutantrace, vox clothing, minor surgery mod for mutantrace specific surgery steps. Fixed captain's jacket sprite. 2013-06-05 17:35:38 +09:30
cib
38cdb4d4f5 Most mobs can emote now.
Also added CSS to say, so that you can tell apart "say" and "me say"
2013-05-18 18:17:28 +02:00
Cael_Aislinn
0dde35b385 unique voice text colour for soghun, skrell and taj
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-10 22:36:23 +10:00
Cael_Aislinn
31349fb7d3 Merge branch 'incremental_tg' r5067 into bs12_with_tgport
removed extraneous admin attack messages, temporarily disabled much moderator stuff (will be re-enabled in future updates)

Conflicts:
	baystation12.dme
	code/__HELPERS/type2type.dm
	code/controllers/configuration.dm
	code/datums/datumvars.dm
	code/datums/helper_datums/getrev.dm
	code/defines/obj.dm
	code/game/gamemodes/events/black_hole.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/job.dm
	code/game/jobs/job_controller.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/machinery/turrets.dm
	code/game/machinery/wishgranter.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/turfs/turf.dm
	code/game/verbs/ooc.dm
	code/global.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/admin.dm
	code/modules/admin/admin_memo.dm
	code/modules/admin/admin_verbs.dm
	code/modules/admin/holder2.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/adminpm.dm
	code/modules/admin/verbs/diagnostics.dm
	code/modules/assembly/igniter.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/suits/jobs.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/mob/new_player/preferences.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/photocopier.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/modules/reagents/Chemistry-Machinery.dm
	code/setup.dm
	code/stylesheet.dm
	code/world.dm
	config/admins.txt
	config/config.txt
	html/changelog.html
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
	icons/turf/areas.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-28 14:13:11 +10:00
Chinsky
b10b035552 Changed Command Channel color to more visible one. 2012-11-06 21:23:58 +04:00
elly1989@rocketmail.com
50fe648a91 Admin ranks now use bitfields for permissions. Rather than checking the name of the rank, adminverbs will now check holder.rights to see if it has certain bits turned on.
SERVER HOSTS:
This commit replaces the existing admin-rank system. It is now more customizable.
Admin.txt essentially works the same as it always has. Each line should look like:
ckey - admin rank

There is now however, an admin_ranks.txt. This textfile allows you to define ranks like so:
admin rank +ADMIN +FUN +BUILD
the +KEYWORD are flags adding permissions to that rank. There are brief descriptions in the text-file explaining what they do.

You can now name the ranks anything you like, and give them the permissions you want them to have. This allows, for instance, ranks like:
Game Admin on disciplinary +ADMIN +BAN
This would give that game admin only the tools they need to admin. They would not have access to 'fun' verbs which control events and antags.
There's lots of things you can do. For instance, a coder rank whom can debug stuff but cannot do admin tasks:
Codermin +DEBUG +VAREDIT +SERVER

There's lots you can do. As it evolves it will hopefully become more flexible.

admin_ranks.txt defaults to use the old admin rank names.

Apologies in advance as there will be a lot of anomalies, such as ranks losing verbs they once had. Please let me know about any problems. I can fix them quite easily simply by moving verbs between the lists or splitting the lists up into new flags.

CODERS:
There is now a check_rights(flags) proc. 
It check is usr is and admin and has -at least one of- the rights specified.
It checks > usr < not src, so keep that in mind!
If you need to check if something other than usr has specific tights, you can do if(holder.rights & R_ADMIN) etc.

KNOWN ISSUES:
+FUN probably needs to be split up into +MOBS and +EVENTS
In-game promotion/demotion is currently disabled. It will be readded after everything else works ok.
Erro's sql rights changes stuff is currently commented out. It will be re-added.
There are still many many verbs which need updating.

Apologies in advance for any inconvenience.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4991 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-02 10:23:04 +00:00
Cael_Aislinn
c0e7ad00b2 merge fixes
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-22 20:25:27 +10:00
Travis Whitehead
524265b872 Fixed Moderator text color in OOC + Mods no longer see admin logs 2012-10-13 03:39:33 -07:00
Cael_Aislinn
419247adfe Merge remote-tracking branch 'remotes/git-svn' 4847 into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/game/verbs/ooc.dm
	code/modules/admin/admin_verbs.dm
	code/modules/food/recipes_microwave.dm
	html/changelog.html

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-12 17:53:17 +10:00
giacomand@gmail.com
5eba2eda1d -Added a new Game Master fun button. It will set the default player OOC colour to whatever the user chooses.
http://i.imgur.com/xRM7j.png

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4845 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-11 22:24:08 +00:00
Erthilo
9387dd2366 * Merged diagonal reaching.
* Merged speech bubbles and pain flashing
* Merged Signaler Dead man switch.
* Merged give verb.
* Merged alien languages
* Merged stuttering, slurring.
* Merged Git Revision Info.
* Fixed mutantraces not having hair/eyes
* Fixed Soghun's not being able to change hair colour.
* Fixed savefiles not saving species.
* Shut up vending machines.
* Added colour to species talk.
2012-08-23 22:43:38 +01:00