cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-23 12:06:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
45,985 Commits 66 Branches 25 Tags
RazMergeTest
Commit Graph
105 Commits
Author SHA1 Message Date
TheFurryFeline 6f9928c028 Config Setting Addition 
On the tin for allowing job change only if TIME OFF is also enabled.
 2019-05-19 15:13:00 -04:00
Reddeyfish 635013f331 Merge branch 'virgoMaster' into virgoPull 2018-06-10 12:33:29 -07:00
Arokha Sieyes 6b42df0685 Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018 
# Conflicts:
#	code/__defines/misc.dm
#	code/controllers/master_controller.dm
#	code/game/machinery/computer3/computers/card.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/stacks/medical.dm
#	code/game/objects/structures/signs.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/client/client defines.dm
#	code/modules/client/client procs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/events/radiation_storm.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
#	code/modules/reagents/reagent_dispenser.dm
#	config/example/config.txt
#	html/changelogs/.all_changelog.yml
#	interface/skin.dmf
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
 2018-05-25 13:23:47 -04:00
Arokha Sieyes 6b4be2d7a8 Paranoid logging and byond account age 
Adds the PARANOIA_LOGGING setting to config.txt (and PANIC_BUNKER which was missing for some reason) and updates example.

PARANOIA_LOGGING (also available as a verb for admins in Server) begins notifying admins of any 0day byond accounts, or users who have never joined before. For when you don't quite want to panic bunker.

Also makes this information available in player panel. Requires SQL connection.
 2018-05-22 23:03:53 -04:00
AnonymousHybi e7822eb506 Adds in the Discord Verification system and fixes the bot~ 2018-05-20 01:32:12 +01:00
Leshana b5cf8383f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14 
# Conflicts:
#	code/game/machinery/jukebox.dm
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
 2018-04-15 14:19:36 -04:00
Lorwp f5c5700e6c Amend MOTD to reference Polaris code 2018-04-01 18:29:55 +10:00
Arokha Sieyes cc353dd6e4 Revises assistant job, and defines config limitations 2018-01-28 23:38:07 -05:00
Arokha Sieyes 446e0f30e3 Configuration option for time_off 2018-01-28 23:27:21 -05:00
Arokha SieyesandLeshana ff228754b3 Merge polaris sync 01 17 2018 
Planes, layers, human/update_icon()
 2018-01-17 17:56:51 -05:00
Leshana 6bc422ff5e Ported VOREStation/VOREStation#461 - Allow greater customisation of wiki links 2018-01-17 16:46:48 -05:00
PrismaticGynoidandAnewbe 10b2cc7eef Multiple loadout slots (#4530) 
* Multiple loadout slots

Ported from Bay. Each character can have 3 (number can be overridden by config) loadout slots. This way, you can have different outfits for different situations without needing to have a separate character slot or edit your loadout every time.

Tested here, works as intended. The current loadout is set as slot 1, so you don't need to worry about remaking it. This also ports the to_file and from_file macros to make it work, I'm assuming they could later be used elsewhere as well.

* Log of Changing
 2018-01-14 14:47:47 -06:00
killer653 315711b314 Pol sync part 2 2017-10-27 15:30:51 -04:00
Anewbe cad5ef12e7 Does work on the event manager role again 2017-10-18 20:00:01 -05:00
AnewbeandGitHub 4459d7087a Revert "Does more prep for the Event Manager role" 2017-10-04 18:33:34 -05:00
Anewbe c2c6b5949a Does more prep for the Event Manager role 2017-10-02 21:51:48 -05:00
Leshana 197a648795 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01 
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/ammunition/magazines.dm
 2017-06-01 17:27:00 -04:00
Leshana 2c8df87899 Tweak to Radiation Optimization 
* Optimized garbage collection of radiation sources until we get qdel() hints.
* Made the RADIATION_LOWER_LIMIT configurable (option for people to save some cpu time)
* Added some comments and broke the proccessor into separate procs for profiling purposes
* Added a changelog.
 2017-05-30 13:55:53 -04:00
Leshana 4fbfa7ee37 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08 
# Conflicts:
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/mob_defines.dm
#	html/changelogs/.all_changelog.yml
#	vorestation.dme
 2017-05-08 21:07:45 -04:00
Leshana 347e759b10 Make the multi-z explosion strength scalar configurable. 
* Its much easier to test out and decide what explosion scalar is nice if you can configure it.
* As an added bonus, by setting it to zero this lets you disable multi-z explosions altogether without turning off all of multi-z.
 2017-05-04 20:27:15 -04:00
Arokha Sieyes 055c998f82 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 
# Conflicts:
#	code/modules/integrated_electronics/subtypes/reagents.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/organs/organ_external.dm
#	code/modules/ventcrawl/ventcrawl.dm
#	html/changelogs/.all_changelog.yml
 2017-04-25 15:04:54 -04:00
Leshana 9a7dda1ad1 Implements footstep sound system and adds sounds to various floor types. 
* Adds system for turfs to have "footstep sounds" that play when someone walks over them.
* Adds system for floor types (the kind of turfs where you can put tiles on them) to support the footstep sounds.
* Adds sounds to plating, tiles, wood, and carpet floor types.
* Footstep sound system is configurable in game_options.txt, it can be turned off completely or the volume adjusted.
 2017-04-18 11:33:44 -04:00
Leshana 7558b365ef Switch VOREStation jukebox to read track list from a configuration file. 
Jukebox will read config/jukebox.txt to find its track list.  This means tracks can be added/removed without recompiling the server.
 2017-03-20 18:37:30 -04:00
Arokha Sieyes 387f429e5e Merge large polaris changes 2017-03-02 22:44:17 -05:00
Neerti 12abb2d6f2 Ports a large chunk of the map datum system that europa/bay uses. 
Links many map-specific details such as the station name, z-level information, and allowed jobs from global vars to map datum vars, which should help us maintain multiple maps at once in the future, which will be needed for the future Southern Cross.
Note that a config change will be needed to change GENERATE_ASTEROID to GENERATE_MAP, otherwise no changes should be required to continue normal map usage.
To change to a different map, it's suggested to tick the file that ticks all the other needed files, which for the Northern Star is called northern_star.dm.
 2017-02-27 07:36:41 -05:00
killer653 3f1e5c80f2 Polaris sync 2017-02-01 15:08:45 -05:00
Anewbe 2eeb4134a8 Ports Bay's Antag Player Age blocker 2017-01-14 17:37:46 -06:00
Eearslya SleiarionandSpades ee797132db Allow greater customisation of wiki links (#461) 2016-08-14 02:28:31 -04:00
Neerti 61e291a083 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard 2016-07-08 21:00:12 -04:00
Anewbe e2f210f5bd Developers now appear in Staffwho 2016-06-27 18:51:40 -05:00
Neerti 20a3bd5b26 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard 2016-06-26 20:14:29 -04:00
EmperorJonandGitHub 254a1a04e0 Revert "Adds byond hub visibility as a config option 2" 2016-06-25 01:15:35 +01:00
spookerton 9a0aef4b83 *Compiles with the correct hub password set in hub.dm by default. 
*Sets world visibility to 0 to maintain prior behavior.
*Adds a configuration toggle for setting the world public on startup.
 2016-06-24 07:39:48 +01:00
Yoshax 0fb98bbabd Scheduler now uses btime, and other improvements 2016-06-01 17:56:07 +01:00
Arokha SieyesandDatraen 6c9346d0c4 Prevent Unexpected SQL Errors (#1628) 
* Don't nag me, game.

* Added disabled message, made config consistent

* Missed adding 'else'
 2016-05-14 21:09:21 -04:00
Datraen 39e5834692 Lowers requirements for the new game modes. 2016-04-02 15:13:54 -04:00
Neerti be43fd1d9e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard 2016-02-07 22:15:36 -05:00
Zuhayr 4aa2e8a269 Added a config option for a visible human deathgasp message. 2016-01-30 08:29:06 +10:30
Neerti 19603db5dc More work on new wizard. 2016-01-14 00:54:07 -07:00
Neerti a9dda6cf3f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge 
Conflicts:
	.travis.yml
	code/game/gamemodes/cult/cult.dm
	code/game/gamemodes/heist/heist.dm
	code/game/gamemodes/ninja/ninja.dm
	code/game/gamemodes/nuclear/nuclear.dm
	code/game/gamemodes/traitor/traitor.dm
	code/game/gamemodes/wizard/wizard.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/objects/structures/lattice.dm
	code/global.dm
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/reagents/Chemistry-Recipes.dm
	config/example/config.txt
	polaris.dme
 2015-09-06 18:26:06 -04:00
Zuhayr 63cb207eb8 Merge pull request #10890 from PsiOmegaDelta/150826-AltLangKeys 
Languages now use alternative prefix keys.
 2015-09-06 17:20:51 +09:30
Ccomp5950 a6e426c864 Update motd.txt 
Something something new link.
 2015-08-27 16:24:43 -04:00
PsiOmegaDelta 5962656c1e Languages now use alternative prefix keys. 
Makes radio and language key overlaps possible.
It is possible to configure the default language keys server side.
Pending: The possibility for players to configure their own language keys.
 2015-08-26 13:17:57 +02:00
Neerti 00fa623c9d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	.travis.yml
	code/controllers/configuration.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/machinery/Sleeper.dm
	code/game/machinery/computer/communications.dm
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/turfs/simulated/floor.dm
	code/game/turfs/simulated/floor_types.dm
	code/global.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	polaris.dme
 2015-08-23 01:30:46 -04:00
Karolis2011 cc029828bb Updated old wiki link to a new one. 2015-08-11 17:20:55 +03:00
Neerti 88270df755 Refactors the map generation to not assume the fifth z-level is mining. Now it checks the config.txt. 2015-08-09 05:49:25 -04:00
Neerti 8152ce0676 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/29/2015_bay_sync 
Conflicts:
	polaris.dme
 2015-07-29 03:45:53 -04:00
Zuhayr e0429af2f7 Added config option for initial brain organ health. 2015-07-27 15:33:54 +09:30
Zuhayr 4afa8a80f8 Readds config option to disable organ decay. 2015-07-27 15:30:38 +09:30
Neerti 6eece8ac45 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/16/2015_bay_merge_2 
Conflicts:
	.travis.yml
	polaris.dme
 2015-07-16 22:46:53 -04:00