cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,256 Commits 5 Branches 0 Tags
3f1e5c80f25af98e27be802cb06a218026a33769
Commit Graph

156 Commits

Author SHA1 Message Date
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 Sleiarion
ee797132db Allow greater customisation of wiki links (#461) 2016-08-14 02:28:31 -04:00
Anewbe
e2f210f5bd Developers now appear in Staffwho 2016-06-27 18:51:40 -05:00
EmperorJon
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 Sieyes
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
Yoshax
8be10d96dd Ports Byond 510 preperations from Bay 
Updates comment

Updates supply file
 2016-03-14 18:21:44 +00:00
Zuhayr
4aa2e8a269 Added a config option for a visible human deathgasp message. 2016-01-30 08:29:06 +10:30
EmperorJon
07d1e6bbaf Merge pull request #531 from EmperorJon/11_Dec._IRC_related_changes 
Makes changes to allow IRC bot output
 2015-12-11 20:09:06 +00:00
Jon
238292a9a6 Makes changes to allow IRC bot output at Sparky's request. 2015-12-11 19:58:05 +00:00
SinTwo
10277880ee Map and GitHub buttons 2015-12-06 01:47:38 -05:00
GinjaNinja32
7024348ff3 fix rules button 2015-12-06 06:02:48 +00: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
PsiOmega
95b12da391 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/__defines/gamemode.dm
	code/game/antagonist/outsider/ert.dm
	code/game/gamemodes/ninja/ninja.dm
 2015-09-05 09:35:02 +02:00
PsiOmega
69fde6af03 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/antagonist/alien/borer.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/nuclear/nuclear.dm
	code/game/gamemodes/traitor/traitor.dm
	code/game/objects/items/robot/robot_parts.dm
	code/setup.dm
 2015-09-05 09:24:30 +02:00
Zuhayr
a0187f66e3 Fixes Secret. 2015-09-05 14:12:20 +09:30
Zuhayr
23fb8d8b99 Antag system cleanup/fixes. 2015-09-04 18:28:05 +09:30
PsiOmegaDelta
85f32efa7a Players can now select their own language shortcut keys. 2015-08-26 15:15:54 +02: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
7fab70767d colony-1 could not be saved, unfortunately. RIP 2015-08-23 18:04:47 -04: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
Kelenius
60196df634 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/modules/projectiles/gun.dm
 2015-08-13 08:40:31 +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
PsiOmegaDelta
5cbb703609 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/unsorted.dm
	code/game/jobs/access.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/update_icons.dm
	code/modules/organs/organ.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/setup.dm
 2015-07-27 10:20:20 +02: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
PsiOmegaDelta
c6f4f7fcee Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-07-12 15:14:43 +02:00
PsiOmegaDelta
7b3759c1f3 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/controllers/configuration.dm
	code/modules/admin/topic.dm
	config/example/config.txt
 2015-07-12 14:49:31 +02:00
Null Snapshot
168f823c35 Fixed up the things pointed out by Ccomp5950. 2015-07-09 22:19:05 -07:00
Null Snapshot
a28d3cd9d1 Added new config variables for toggling moderator tempban permissions and maximum duration for bans. 2015-07-09 12:10:18 -07:00
mwerezak
087a978d56 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into clickcooldown 
Conflicts:
	code/_onclick/click.dm
	code/_onclick/telekinesis.dm
	code/game/objects/items.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/carbon/resist.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
 2015-06-28 22:35:14 -04:00
Neerti
462eaa834b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/25/2015_bay_sync 
Conflicts:
	.travis.yml
	code/modules/clothing/spacesuits/rig/modules/combat.dm
	code/modules/clothing/spacesuits/rig/modules/utility.dm
	code/modules/mob/living/silicon/ai/ai.dm
	icons/mob/rig_back.dmi
	polaris.dme
 2015-06-25 18:50:18 -04:00
PsiOmegaDelta
1558bd5b75 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/toys.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living_defense.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers.dm
	html/changelogs/.all_changelog.yml
 2015-06-19 10:19:08 +02:00
PsiOmegaDelta
f5da9f70c5 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	config/example/config.txt
 2015-06-19 09:55:48 +02:00
Ccomp5950
eea423ce0f Merge pull request #9857 from GinjaNinja32/bot 
Adds support for bots which use world.Export() for server-to-bot communication
 2015-06-18 13:46:50 -04:00
GinjaNinja32
8d232e9304 Adds support for bots which use world.Export() for server-to-bot communication 2015-06-18 18:34:55 +01:00
GinjaNinja32
a60b91fd1b Adds a new configuration value, SERVERURL, for the IRC bot to use if set 2015-06-17 10:00:35 +01:00
Kelenius
0071ed3f24 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/_onclick/click.dm
	code/_onclick/telekinesis.dm
	code/game/machinery/deployable.dm
	code/game/objects/items.dm
	code/game/objects/structures/grille.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
	code/setup.dm
 2015-06-07 14:05:54 +03:00
Neerti
f43bd102f2 Makes the code compile. 2015-06-05 22:58:51 -04:00
Neerti
2a45114038 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/5/2015_bay_merge 
Conflicts:
	.travis.yml
	code/controllers/configuration.dm
	code/datums/supplypacks.dm
	code/game/machinery/bluespacerelay.dm
	code/game/machinery/hologram.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/circuitboards/machinery/commsantenna.dm
	code/game/turfs/simulated/floor.dm
	code/game/turfs/simulated/floor_types.dm
	code/game/turfs/simulated/walls.dm
	code/global.dm
	code/modules/clothing/spacesuits/rig/suits/ert.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/research/designs.dm
	config/example/config.txt
	icons/mob/feet.dmi
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/rig_modules.dmi
	interface/interface.dm
	maps/exodus-3.dmm
	polaris.dme
 2015-06-05 22:11:15 -04:00
PsiOmega
d0232732d4 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/floodlight.dm
	code/game/objects/items/devices/suit_cooling.dm
	code/modules/organs/subtypes/diona.dm
	code/modules/paperwork/pen.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	html/changelogs/.all_changelog.yml
 2015-05-30 16:11:57 +02:00
PsiOmega
5e84bfa57c Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/clothing/spacesuits/rig/suits/ert.dm
 2015-05-30 15:59:54 +02:00
PsiOmega
4ce737d87d Server build date and revision. 
Can now see the current compilation date and revision:
* In the Dream Daemon log output.
* By using the "Show Server Revision" client verb which also links you to the commit in question.
 2015-05-29 08:26:31 +02:00
Zuhayr
5ea78421ff Merge pull request #9408 from mwerezak/sm-eject 
Limits the ability of the SM to return to the station zlevel once ejected
 2015-05-28 11:35:39 +09:30
PsiOmega
98c585615e Inactivity process tweaks. 
Partially by request:
The inactive check process now respects client holder status and can be configured how long clients may remain inactive before being kicked.
 2015-05-26 09:04:26 +02:00