Commit Graph

327 Commits

Author SHA1 Message Date
Tkdrg
e2187614fd Merge remote-tracking branch 'upstream/master' into hog-mergeconflicts
Conflicts:
	code/__DEFINES/hud.dm
	code/__HELPERS/game.dm
	code/_onclick/hud/_defines.dm
	code/_onclick/hud/hud.dm
	code/game/gamemodes/antag_spawner.dm
	code/game/gamemodes/game_mode.dm
	code/game/machinery/turrets.dm
	code/modules/client/preferences_toggles.dm
	code/modules/events/alien_infestation.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/alien/special/alien_embryo.dm
	code/modules/mob/living/simple_animal/revenant/revenant.dm
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/hud.dmi
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/items.dmi
	icons/obj/projectiles.dmi
	icons/obj/storage.dmi
2015-11-02 01:06:30 -03:00
MrStonedOne
6f6654436f The Game Preferences verb now opens directly to the game settings tab. 2015-10-26 07:51:20 -07:00
MrStonedOne
3303176f14 Adds the ability to access game preferences while not in lobby
Also removed a few preferences_toggles verbs that are no longer needed.

Haven't tested this too much yet, but from what I can tell, no ill effects of doing this have been observed.
2015-10-26 06:57:20 -07:00
Remie Richards
fa75581074 Merge pull request #12586 from Jordie0608/thisprnotinspiredbyanymemberofthecommunityhonest
Selective ooc muting
2015-10-25 19:11:21 +00:00
phil235
5ab3ad56db Merge pull request #12557 from RemieRichards/Ports-GoonTooltips-ByWireWraith
Ports goon tooltips made by Wirewraith
2015-10-23 22:16:22 +02:00
Jordie
94991be225 whoops 2015-10-23 18:41:29 +11:00
Jordie0608
d8cef19a05 operator, savefile and list find update 2015-10-23 18:39:29 +11:00
Jordie0608
1f1880e3f9 selective ooc muting 2015-10-23 00:41:01 +11:00
Remie Richards
910f280a3b Moves procs to appropriate files, Adds some sanity+feature wrapper procs for Tooltips, adds some UI style themed CSS classes to use as tooltip themes (Auto used by the wrapper if no theme specified) 2015-10-21 12:53:45 +01:00
oranges
f570aa6410 Move autoadmin to a protected config datum
This prevents any admin with permission to debug controller being able to edit this setting
2015-10-20 14:42:21 +13:00
Razharas
e989a0fbc4 Merge pull request #12290 from AnturK/freeadmin
Autoadmin Config
2015-10-19 21:50:01 +03:00
Razharas
d7107264aa Merge pull request #12429 from Shadowlight213/Kittygobyebye
Fixes the roundstart catperson exploit.
2015-10-18 00:42:38 +03:00
Razharas
d809f57de7 Merge pull request #12172 from MrStonedOne/webclientconfig
Adds config option for allowing webclient.
2015-10-16 21:49:50 +03:00
Shadowlight213
88e23b3003 Overrides human feature loading if mutant humans disabled. 2015-10-15 22:46:11 -07:00
AnturK
4b95cb4aa6 Update client procs.dm 2015-10-10 20:08:50 +02:00
Kyle Spier-Swenson
14012f1d35 Fixes compile error in client procs from mismatched () 2015-10-10 10:05:50 -07:00
Kyle Spier-Swenson
0a3740c13f Changes webclient member checking to use IsByondMember()
You can disable byond member features in preferences, something the other method checked, but this could lead to somebody not being able to get in to re-enable them.
2015-10-10 09:43:25 -07:00
AnturK
fb57e989ce Autoadmin initial 2015-10-10 12:37:12 +02:00
Remie Richards
97de4b2ebe Merge branch 'master' of https://github.com/tgstation/-tg-station into HandOfGod-Resurgence
Conflicts:
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/storage.dmi
2015-10-07 22:24:53 +01:00
Remie Richards
b9394257da About a million changes, but largely: Functional (Sort of) Antag Huds, Mind fixes, and Final glue to get the mode working. 2015-10-07 22:11:19 +01:00
Razharas
0ad7257a52 Merge pull request #12089 from MrStonedOne/maprotation
HOLY FUCKING SHIT, I'VE DONE IT! Map rotation!
2015-10-07 07:53:42 +03:00
MrStonedOne
f05d5e1d61 Adds config option for allowing webclient.
Also adds a config option to restrict webclient to byond members only.
2015-10-04 21:06:45 -07:00
Pieter Vlasblom
8d5bb4d126 8 reasons frying a cpu will change the way you think about everything. 2015-10-05 03:33:38 +02:00
MrStonedOne
fb01e5ce71 Cleans up map rotation code, removes debugging code 2015-09-30 08:43:22 -07:00
MrStonedOne
fcc8402f31 map rotation base code 2015-09-30 07:13:38 -07:00
Remie Richards
131b69474e Merge branch 'master' of https://github.com/tgstation/-tg-station into HandOfGod-Resurgence
Conflicts:
	code/__HELPERS/unsorted.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/modules/client/preferences.dm
	icons/mob/feet.dmi
	icons/mob/head.dmi
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/mob/mob.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/items.dmi
	icons/obj/projectiles.dmi
2015-09-27 17:15:01 +01:00
Remie Richards
58483beb50 Hand of god gamemode!
be_special and antag defines are no longer limited to 16 values (1 - 32768) by being changed from a bitfield to a list, an appropriate block of code exists to automatically update bitfield versions to the new list format. the list format allows us to have (functionally) infinite antag types.
2015-09-27 16:49:56 +01:00
MrStonedOne
c45a7c7173 MERGE CONFLICTS, MY ONLY WEAKNESS
How did you know?
2015-09-26 23:42:14 -07:00
MrStonedOne
eb8b97cb2b Cleans up isbanned() and stickyban handling
isbanned() cleaned up, it logs sticky ban matches, and better handles admins being exempt from bans
Adminbans now still work once the admin is demoted.
Admins bypassing a ban because they are an admin is logged and announced to all admins including the one who walked past it.
Admins are now exempt from host bans. (this only applies to host bans for ss13, global host bans (where the 'apply to this game only' checkbox is not checked (defaults to not checked)) do not trigger isbanned() and thus, admins can not bypass them, no matter what we do.)

Added a system to queue a message for a client, to be shown next time they connect, this was needed because isbanned() is called before the client is created, so if you want to send a message to an admin, letting them know they just walked pass a matching ban, you have to do it this way.
2015-09-26 23:30:26 -07:00
Razharas
b6e4ef88ec Saving the data collecting
Saving the data collecting
2015-09-25 22:52:30 +03:00
Razharas
df189498ce The final solution of bad taste in midis question
The final solution of bad taste in midis question
Added special client verb that kills all sounds currently playing for
this client
This is better because toggle midis only pauses them, not actually stops
them
2015-09-25 22:42:24 +03:00
phil235
f90ee4aa8c - Fixed monkey starting with no dna.
- Fixed bugs with monkeyize/humanize: 7803 (humanized monkey nobloodtype)
- Fixes 9298 monkeyed ling have troubles humanizing themself (already fixed?)
- Fixes despawning clothes when monkeyizing. 11855
- Replaced check_dna_integrity proc by simpler has_dna proc when required.
- created set_species() proc
- fixed space retrovirus not transfering SE (despite having a domutcheck()). Still need to check if it needs a name = real_name.
- I renamed mecha/var/dna to dna_lock to avoid confusion
- I renamed an armor var in a species proc to armor_block to avoid confusion with species/var/armor.
- I removed many if(dna) checks in lots of files.
- I removed duplicate defense procs between human/proc/X and dna.species/proc/X since dna is now always set.
- Anatomic panacea from changeling removes alien embryo correctly. 6247
- Fixes runtime when trying to put dna-less brain mmi into a dnalocked mech.
- Removed carbon/var/list/features, we now only have dna.features and prefs.features
- Remove hulk mutation from lizards and other species (Fixed 6413); only real humans can acquire hulk. (less work on sprites for each ones, fixes lizard tail not in hulk color)
- Fixes cloning not setting up correctly dna UE and dna.real_name
- I fixed the issue with sucked+cloned ling being unable to absorb
- I fixed issue with changeling proc checking if they have the dna already not working.
- Fixed 4095, low health hulk with DAA getting stuck in loop of acquiring/losing hulk.
- I added a second layer for mutations to differientate mutations that go below and above the body layer (Fixes 7858)
- Fixes 10048, the transform to initial appearence button was fucking up the dna.

- Fixes cloning not setting up correctly dna UE and dna.real_name
- Fixed the issue with sucked+cloned ling being unable to absorb
- Fixed issue with changeling proc checking if they have the dna already not working.
- Fixed 4095, low health hulk with DAA getting stuck in loop of acquiring/losing hulk.
- Added a second layer for mutations to differientate mutations that go below and above the body layer (Fixes 7858)
- Fixes 10048, the transform to initial appearence button was fucking up the dna.
2015-09-19 22:18:28 +02:00
phil235
428a28a440 Fixes monkeyize/humanize removing the mob's viruses when they should be kept.
Fixes NOCLONE and CLUMSY being in both disabilities and mutations. they're now only disabilities.
Fixes minttoxin not gibbing people with the fat disabilities.
Fixes some runtimes, replacing usr by user in some places.
Fixes mutation overlays being removed when updating overlays.
Remove the now unused mob/var/list/mutations and human/var/blood_type
Fixed some formatting in preferences.dm
2015-09-13 22:52:38 +02:00
Jordie0608
08cfaf0b5f see jobban reasons from char setup 2015-09-07 20:44:08 +10:00
Jordie0608
b7754d5ed7 announce login message as a config 2015-09-04 21:49:09 +10:00
Aranclanos
7d729e270b Merge pull request #11508 from Core0verload/spider
Removes unused SpiderOS icons
2015-09-01 12:25:56 -03:00
Razharas
087758925f Merge pull request #11336 from Aranclanos/IactuallyHateThem
Adds a happy greeting for my friends the admins who I love!
2015-09-01 10:07:31 +03:00
c0
b494d60ea2 Removes unused SpiderOS icons 2015-08-31 10:58:14 +03:00
Jordie0608
62fa9a163c interface for watchlist, improvements to memo, varedit, ban interfaces 2015-08-27 20:57:01 +10:00
Aranclanos
2476ddfbad Adds a happy greeting for my friends the admins who I love! 2015-08-23 09:55:00 -03:00
Jordie0608
e4b21e30d3 autoconvert notes to sql procs 2015-08-17 15:24:50 +10:00
Jordie
73fa75873c Merge pull request #10908 from Jordie0608/sqlstandsforseriouslyquestionablelogic
Memo update
2015-07-29 21:35:28 +10:00
Jordie0608
f9b6dfcefe login memo fix 2015-07-28 23:24:25 +10:00
phil235
dac815d698 Fixes the lizard gender issue.(updated version of SvartaSvansen's PR. 2015-07-27 15:30:06 +02:00
Jordie0608
f7b66edb17 migrates admin memos to use database 2015-07-19 17:01:38 +10:00
phil235
3a93eeabba Merge branch 'master' of https://github.com/tgstation/-tg-station into DrinkingGlassPourFix
Conflicts:
	code/game/jobs/job/cargo_service.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/job.dm
2015-07-16 14:19:29 +02:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
phil235
ce101208a9 Fixes Satchel preference not working.
Also some simplification of the equip_backpack() proc.
2015-07-15 17:38:03 +02:00
MrStonedOne
bdb264acdf Removes topic limiter.
Topics are no longer limited to once per 2ds per client.

This massively improves responsiveness by no dropping clicks when trying to browse thru menus.

Anything that could cause lag or otherwise be limited should do that in its own topic, not blog down the rest

Please let me know if you can think of anything that should be limited in this PR otherwise, i say we find out by field testing.
2015-07-11 23:09:04 -07:00
Jordie
db8655d878 Merge pull request #10439 from Incoming5643/takethatracism
Fixes Mutantrace Color Selection
2015-07-09 20:44:56 +10:00