cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 13:13:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,041 Commits 6 Branches 0 Tags
b801f6d8469795b811d88cb1563d53ce8cc1cbda
Commit Graph

115 Commits

Author SHA1 Message Date
Casey
2168abb7a8 Merge pull request #14013 from Very-Soft/playernarrate 
Player Narrate
 2022-10-30 15:27:29 +00:00
Casey
26ef87b629 Merge pull request #13796 from Heroman3003/drudakar-fix 
Fixes D'Rudak'Ar not having oldchat font
 2022-09-24 00:24:59 +00:00
Nadyr
19d875c734 Merge branch 'master' into upstream-merge-13503 2022-08-28 18:06:43 -04:00
Casey
93870dd2e2 Mentor QOL changes 2022-08-15 01:15:14 +00:00
Casey
529616b1aa Adds mentors 2022-08-14 19:10:14 +00:00
Novacat
689831a26f Merge pull request #12930 from Heroman3003/language-colors 
Language color fixes
 2022-05-08 21:33:26 +00:00
Casey
2cb5401848 Merge pull request #12902 from Heroman3003/echosong 
Adds Echo Song language
 2022-05-08 09:53:38 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Novacat
bc7d975996 Merge pull request #9809 from Heroman3003/whoopsie-dwoopsie 
Fixes oldchat formatting issues
 2021-02-28 01:58:16 +00:00
Novacat
95fbbf13aa Merge pull request #9753 from VOREStation/upstream-merge-7887 
[MIRROR] Sinta'unathi language color change
 2021-02-19 23:09:14 +00:00
Nadyr
b95c39e483 Merge pull request #1129 from CHOMPStationBot/upstream-merge-9581 
[MIRROR] Makes me's in oldchat not be italicized
 2021-01-16 20:09:03 -05:00
Nadyr
5e8dccd85c Update stylesheet.dm 2021-01-16 19:54:45 -05:00
Nadyr
e06c976953 Update stylesheet.dm 2021-01-16 19:53:45 -05:00
Novacat
ae3ece269d Merge pull request #9581 from Heroman3003/STOP-THE-ITALICS 
Makes me's in oldchat not be italicized
 2021-01-16 23:48:15 +00:00
Chompstation Bot
6ddd2efb7b [MIRROR] Blob Genesis 2021-01-13 00:22:31 +00:00
Nadyr
9450047efe Update stylesheet.dm 
Fix upstream conflict
 2020-10-22 10:07:34 -04:00
Chompstation Bot
6d02d61e54 Adds Spacer Language 2020-10-19 10:40:15 +00:00
Razgriz
0a2d4840e9 Fix stylesheet again 
WHY DOES IT KEEP CHANGING
 2020-05-25 13:45:30 -07:00
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
izac112
a964a3a1bc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 23:26:52 +02:00
Razgriz
bf63bbe527 Update stylesheet.dm 2020-05-15 14:38:58 -07:00
Atermonera
b6c8d31829 cleans up advanced_who output (#7148) 
* cleans up advanced_who output

* Missing tag
 2020-05-15 16:37:35 -04:00
izac112
e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
 2020-05-06 21:53:03 +02:00
Atermonera
23e72aa709 Merge pull request #7043 from MisterLayne/prommie-lang 
Promethean Language
 2020-05-03 03:14:21 -04:00
Erik
eb9c3cd387 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020 2020-04-11 16:53:35 -07:00
Repede
7f1a6d6cc7 Fuck this shit 
Merge branch 'release' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	code/controllers/autotransfer.dm
#	code/controllers/subsystems/inactivity.dm
#	code/game/area/Away Mission areas.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/civilian.dm
#	code/game/jobs/job/security.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/air_alarm.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/machinery/suit_storage_unit_vr.dm
#	code/game/mecha/combat/gorilla.dm
#	code/game/turfs/simulated/dungeon/wall.dm
#	code/game/turfs/simulated/wall_types.dm
#	code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
#	code/modules/clothing/spacesuits/void/void_vr.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/mob/language/station_vr.dm
#	code/modules/mob/living/carbon/human/emote_vr.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
#	code/modules/mob/new_player/sprite_accessories_vr.dm
#	code/modules/power/apc.dm
#	code/modules/power/lighting.dm
#	code/modules/resleeving/machines.dm
#	config/jobwhitelist.txt
#	icons/mob/species/seromi/head.dmi
#	icons/mob/species/seromi/suit.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	maps/tether/submaps/_tether_submaps.dm
#	maps/tether/tether_areas2.dm
#	maps/tether/tether_defines.dm
#	maps/tether/tether_shuttles.dm
#	nano/templates/apc.tmpl
#	vorestation.dme
 2020-04-04 14:37:55 -04:00
Aronai Sieyes
8a33afaff6 VChat: Redone chat output done in Vue.js 2020-03-27 17:08:14 -04:00
Atermonera
d397c2c1fe Merge pull request #6840 from Neerti/qol_notification_sounds 
QoL: Various Notifications
 2020-03-20 15:09:47 -04:00
SplinterGP
c24b6b2d5c puts ywedit on stylesheet.dm for grey language color 
title
 2020-02-07 21:39:58 -03:00
SplinterGP
7c0796668d Adds grey, sprites for items, (jumpsuit etc.) for them, add them to rigsuit list, and also adds their language that they use and telepathy 2020-02-05 19:43:55 -03:00
Razgriz
6efce72924 Add files via upload 2019-12-25 04:19:32 -07:00
elgeonmb
9d056decda Adds the Zaddat Race + Modifies pressure damage calculations 2019-03-28 16:54:32 -04:00
Spades
c6c7d98a2d Merge branch 'master' into upstream-merge-5735 2019-01-14 11:20:55 -05:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
HungryMoth
6ced431d0f Update stylesheet.dm 2018-11-10 17:16:58 -05:00
Leshana
a0de41f24f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15 
# Conflicts:
#	README.md
#	code/__defines/mobs.dm
#	code/__defines/subsystems.dm
#	code/_helpers/global_lists.dm
#	code/controllers/subsystems/garbage.dm
#	code/controllers/subsystems/overlays.dm
#	code/datums/datacore.dm
#	code/datums/supplypacks/munitions.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/weapons/id cards/station_ids.dm
#	code/game/objects/random/random.dm
#	code/game/turfs/simulated/floor.dm
#	code/game/turfs/simulated/floor_icon.dm
#	code/modules/awaymissions/gateway.dm
#	code/modules/client/preferences.dm
#	code/modules/ext_scripts/python.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_defines.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/robolimbs.dm
#	code/modules/reagents/reagent_containers/glass.dm
#	code/modules/reagents/reagent_containers/syringes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-4.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
 2018-03-15 22:41:14 -04:00
Cerebulon
b7090d7df2 Adds Tajaran Akhani language. (#5032) 
* Adds Tajaran Akhani language.
Fixes plural form of Tajaran (Tajara->Tajaran) in about 50 places.

* Gives the language a colour distinct from Siik.

* Changelog
 2018-03-11 16:55:08 -05:00
Arokha Sieyes
3fe17274d2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 
# Conflicts:
#	code/ATMOSPHERICS/pipes.dm
#	code/game/turfs/flooring/flooring.dm
#	code/modules/clothing/clothing_accessories.dm
#	code/modules/mob/living/carbon/human/inventory.dm
#	html/changelogs/.all_changelog.yml
 2018-02-27 21:27:35 -05:00
elgeonmb
8c9c99f817 Adds new languages (#4961) 
* langs

* humanity first

* humanity first but for real this time

* i know how to spell good

* grumbles
 2018-02-26 21:21:50 -06:00
Arokha Sieyes
d998f36c38 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync2018 
# Conflicts:
#	code/game/objects/structures/signs.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/organs/organ_icon.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
 2017-12-26 23:07:58 -05:00
Woodratt
ed9395e58f SC Stupid Sized Map Update 
Or how Woodrat spent too long on something that was supposed to be simple.

- Addition of a Explorer Radio Channel and headsets.
- Explorers and Search and Rescue job slots added
- Adjustments to the pilot job including getting rid of the flatcap
- Map fixes, adjustments, (including signs pointing to cryo) planetside side map additions splitting up of the wilderness into two area sections
- Disabled lighting on the arrivals shuttle area once it is docked with the station, should help with the whole issue of lighting bugging out and having dark space
- Fixed EMS jacket missing icons
- Fixed Research signs being missing for some reason, addition of directional signs for cryo
- Addition of a Search and Rescue Winter coat
- Probably a dozen other small bug fixes I forgot, and bug additions

Tested, seems fine. At least in short tests.
 2017-12-24 07:04:34 -08:00
killer653
da0bf3743b Polaris sync 2017-11-17 19:27:03 -05:00
Anewbe
401e23daf1 Makes it pink 2017-11-06 19:09:11 -06:00
killer653
0c480ec15f Polaris sync 2017-10-27 15:30:24 -04:00
Mechoid
920e823a46 Fuel-Rod Gun, Minor fixes related. (#4103) 
* A whole load of things.

* Fixes the SM Rod's travel distance.
 2017-10-19 15:07:52 -05:00
Cameron Lennox
15a6472d14 Pol Sync 2017-10-08 17:44:25 -04:00
Anewbe
f856755c55 Merge pull request #3892 from MisterLayne/9/19/2017_SkrellLangColorChange 
Skrell Language Color Change-
 2017-09-24 00:48:14 -05:00
killer653
2755d3ddb1 HOTFIX 2017-09-21 20:26:48 -04:00
MisterLayne
5580d29ae6 Changes Skrell Color Language 2017-09-19 21:00:44 -04:00
Anewbe
d0d840082a Adds an event_manager chat channel 2017-09-17 19:48:51 -05:00