cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-04 14:33:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,425 Commits 7 Branches 0 Tags
b456b5287b3bdd2da43b51a226c1031c69efe957
Commit Graph

177 Commits

Author SHA1 Message Date
Heroman3003
1a9cdecb32 Finishes timeclock duty switching functionality 2019-04-19 10:28:38 +10:00
Repede
e4dd365fe1 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/controllers/subsystems/mapping_vr.dm
#	code/datums/datum.dm
#	code/datums/datumvars.dm
#	code/datums/supplypacks/voidsuits.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/defib.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/world.dm
#	code/modules/client/preference_setup/loadout/loadout_accessories.dm
#	code/modules/client/preference_setup/loadout/loadout_eyes.dm
#	code/modules/client/preference_setup/loadout/loadout_head.dm
#	code/modules/client/preference_setup/loadout/loadout_suit.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/food/food/snacks.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/reagents/Chemistry-Recipes.dm
#	code/world.dm
#	config/custom_items.txt
#	config/example/config.txt
#	config/example/game_options.txt
#	icons/mob/robots.dmi
#	icons/obj/mining.dmi
#	maps/submaps/surface_submaps/wilderness/wilderness.dm
#	vorestation.dme
 2019-04-07 19:40:12 -04:00
Neerti
1d59d8683c Replaces AI-controlled Maint Drones with AI-controlled Borg Shells 2019-04-06 05:07:05 -04:00
Novacat
7701db8aae Update game_options.txt 2019-03-28 21:02:43 -04:00
Neerti
256fb03dcc Merge pull request #5942 from Anewbe/headgibs 
Headgibbing is a config thing
 2019-03-28 20:38:34 -04:00
Atermonera
db1fdccdd5 Merge pull request #5898 from Anewbe/more_gibberish 
Removes the hyphen from default language keys, should make people spew gibberish less
 2019-03-27 21:15:27 -04:00
Unknown
03dcb65c01 Fixes most of the issues 2019-03-27 00:38:44 -04:00
Anewbe
ebf62629b5 Adds ability to selectively disable submap rotation. 2018-12-05 17:16:27 -05:00
Repede
b83e867682 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	code/modules/power/lighting.dm
 2018-06-02 18:33:44 -04: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
Repede
95a1fade33 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/clothing/gloves/miscellaneous_vr.dm
#	code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/eating/bellymodes_vr.dm
#	config/custom_items.txt
#	config/example/motd.txt
#	icons/mob/human_face_or_vr.dmi
#	icons/mob/vore/taurs_vr.dmi
#	vorestation.dme
 2018-04-20 09:03:58 -04: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
Kelshark
c048a8ea8b Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/vore/weight/fitness_machines_vr.dm
#	config/custom_items.txt
 2018-02-02 19:25:51 -05: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
Kelshark
85f9061592 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/controllers/autotransfer.dm
#	code/datums/supplypacks/contraband.dm
#	code/datums/supplypacks/munitions.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	code/modules/reagents/reagent_containers/food/snacks.dm
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	icons/mob/vore/taurs_vr.dmi
#	vorestation.dme
 2018-01-24 19:52:12 -05:00
Arokha Sieyes
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
PrismaticGynoid
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
Kelshark
33d109b2dd Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	config/custom_items.txt
 2017-11-25 11:35:10 -05:00
Kelshark
92980edc93 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/jobs/job/science.dm
#	code/modules/mob/living/carbon/human/species/station/human_subspecies.dm
#	code/modules/mob/living/carbon/human/species/station/seromi.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	config/custom_items.txt
 2017-10-29 18:14:56 -04: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
Anewbe
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
Kelshark
a17b2437e8 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	config/custom_items.txt
#	vorestation.dme
 2017-06-12 12:39:07 -04: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
Kelshark
3d466d9213 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi
 2017-05-12 13:06:10 -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
Kelshark
71c0531829 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/multiz/basic.dm
#	config/custom_items.txt
 2017-04-29 10:13:45 -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
Kelshark
139dbf132c Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	maps/RandomZLevels/listeningpost.dmm
#	vorestation.dme
 2017-03-26 00:20:03 -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
Kelshark
081e280e27 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/global.dm
#	config/custom_items.txt
#	icons/mob/human_races/r_xenochimera.dmi
#	vorestation.dme
 2017-03-03 19:17:04 -05: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
Kelshark
9ce88c8c6c Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/carbon/human/species/station/seromi.dm
#	code/modules/mob/living/silicon/robot/robot_modules.dm
#	config/custom_items.txt
#	icons/obj/gun.dmi
#	maps/virgo-1.dmm
#	vorestation.dme
 2017-02-03 21:35:22 -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
Kelshark
e0a77b629d Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/hub.dm
#	code/modules/clothing/spacesuits/rig/suits/station_vr.dm
#	code/modules/vore/resizing/resize_vr.dm
#	vorestation.dme
 2016-08-21 16:05:27 -04:00
Eearslya Sleiarion
ee797132db Allow greater customisation of wiki links (#461) 2016-08-14 02:28:31 -04:00
Kelshark
c5e17d3ca8 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/hub.dm
#	config/example/config.txt
 2016-08-08 13:26:02 -04:00
Kelshark
52d70160b5 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/egg_vr.dm
#	code/hub.dm
#	code/modules/mob/living/carbon/human/human_species_vr.dm
#	code/modules/mob/living/carbon/human/species/species_vr.dm
#	code/modules/mob/living/carbon/human/species/station/monkey_vr.dm
#	code/modules/mob/living/carbon/human/species/station/station_special_vr.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/mob/new_player/sprite_accessories_vr.dm
#	code/modules/vore/eating/bellymodes_vr.dm
#	icons/obj/egg_vr.dmi
 2016-07-18 22:47:46 -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