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
48,772 Commits 5 Branches 0 Tags
a3fb3e395025937f974c3e26d6bfad57a37ff37d
Commit Graph

175 Commits

Author SHA1 Message Date
Heroman3003
a3fb3e3950 Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin 2019-10-29 09:33:48 +10:00
Novacat
54aeb32617 Merge pull request #6091 from Novacat/nova-ert 
Uplink additions
 2019-10-21 21:01:06 -04:00
Novacat
6e5acef9f0 Update station_vr.dm 2019-10-21 19:01:05 -04:00
Unknown
7dd592aa05 Uplink additions 
Adds a few tools and medicines to uplinks. Also includes some polaris-side radio tweaks since I forgot I had it on this branch.
 2019-10-21 18:57:44 -04:00
Mechoid
169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
Unknown
10f290106c Ports pan-slavic from Baystation 2019-09-18 15:57:30 -04:00
Novacat
960df85343 Update generic.dm 2019-06-24 16:11:46 -04:00
Atermonera
2064228917 Blindly adds partial cross-language intelligibility 2019-06-24 15:22:06 -04:00
Heroman
4a5512c864 hud, procs work 2019-04-27 11:20:35 +10:00
Heroman3003
ea1b347a40 Restricts monkey languages, changes the keys on existing 2019-04-08 12:02:16 +10:00
Unknown
326a4c96fc Unwhitelists 2019-03-28 19:53:00 -04:00
Neerti
8e86e8383e Bugspeak is whitelisted 2019-03-28 19:51:07 -04:00
elgeonmb
9d056decda Adds the Zaddat Race + Modifies pressure damage calculations 2019-03-28 16:54:32 -04:00
Novacat
8ff24f1c30 Merge pull request #4702 from VOREStation/upstream-merge-5885 
[MIRROR] Bots don't speak gibberish
 2019-03-27 19:25:50 -04:00
Novacat
4c18bff57b Merge pull request #4696 from VOREStation/upstream-merge-5859 
[MIRROR] Audible emotes can be used again
 2019-03-27 19:01:55 -04:00
Novacat
713e33054e Merge pull request #4688 from VOREStation/upstream-merge-5843 
[MIRROR] Adds Gibberish
 2019-03-27 18:01:56 -04:00
Spades
6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
Neerti
d3a73ba066 Merge pull request #5885 from Atermonera/botspeak 
Bots don't speak gibberish
 2019-01-20 02:48:12 -05:00
Neerti
b5790fca21 Merge pull request #5859 from Anewbe/emote_fix 
Audible emotes can be used again
 2019-01-18 18:15:39 -05:00
Atermonera
c064271fb3 Merge pull request #5843 from Anewbe/gibberish 
Adds Gibberish
 2019-01-16 22:46:41 -05:00
Spades
c6c7d98a2d Merge branch 'master' into upstream-merge-5735 2019-01-14 11:20:55 -05:00
kevinz000
fc178c1e04 Makes math helpers defines for performance 2018-12-06 16:15:00 -05:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
HungryMoth
3ce47937a4 Updated Lore for Vasilissans 2018-11-27 13:36:52 -05:00
HungryMoth
48509737c6 Update station_vr.dm 2018-11-10 17:21:38 -05:00
Baguette
34f7d86791 Replaces Skrell namegen (#5453) 
Created a first name list for Skrell, to replace the syllable assembler.

Created a surname list for Skrell to replace the syllable assembler.

Replaced the Skrell namegen with pre-written namelists, instead of the old syllable assembler.
 2018-07-30 05:10:40 -04:00
Anewbe
edf92c57f9 Language and Larynx Additions 2018-07-14 00:14:49 -04:00
Neerti
aff66f9037 Taj Sign Language works 2018-07-09 02:00:19 -04:00
Atermonera
308c4b64e0 Renames Taj Sign Language 2018-07-02 00:49:17 -04:00
Arokha Sieyes
ae755b776c Remove the custom Virgo version of siiktajr 2018-07-02 00:21:41 -04:00
Anewbe
8b813107c1 Merge pull request #5361 from Novacat/spriteadd 
Ports Siik'Tajr from Baystation
 2018-06-29 15:49:56 -04:00
Unknown
c691ad5b8d Ports Siik'Tajr from Baystation 
Tail Sign language!
 2018-06-13 02:13:31 -04:00
pontifexminimus2
3ea860ae99 Typo 
Oops, that doesn't belong there...
 2018-06-02 18:32:42 +02:00
pontifex2
2f3fa81425 Assorted Zorren changes to make them in line with the lore I set up. 
Changed their blood colour to a blue.
Replaced their native language Siik (?? This is the Tajaran language) with Terminus, a Polaris language currently whitelisted.
Disabled the whitelist for Terminus.
Changed the description for Terminus so it's actually the Zorren's language.
 2018-06-02 18:28:44 +02:00
Arokha Sieyes
2d89d63c09 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-27-2018 
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/l3closet.dm
#	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/game/objects/structures/crates_lockers/closets/utility_closets.dm
#	maps/southern_cross/structures/closets/misc.dm
#	maps/submaps/surface_submaps/wilderness/DoomP.dmm
#	vorestation.dme
 2018-05-27 19:26:12 -04:00
Mechoid
917c7b71a5 Box of Things for Events and the Future MK1 (#5281) 
* Lots of Stuff for Events

* Adds changelog.

* Review & QOL
 2018-05-25 16:26:31 -07:00
Leshana
6756c5a483 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30 
# Conflicts:
#	.travis.yml
#	code/ATMOSPHERICS/components/unary/outlet_injector.dm
#	code/__defines/_planes+layers.dm
#	code/__defines/chemistry.dm
#	code/__defines/mobs.dm
#	code/_helpers/mobs.dm
#	code/_onclick/hud/robot.dm
#	code/game/area/areas.dm
#	code/game/machinery/computer/supply.dm
#	code/game/machinery/cryopod.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/devices/communicator/messaging.dm
#	code/game/sound.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin.dm
#	code/modules/client/preference_setup/occupation/occupation.dm
#	code/modules/events/event_container.dm
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/language/language.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/human_powers.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/species_shapeshift.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_powers.dm
#	code/modules/mob/living/say.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/logout.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
#	code/modules/reagents/reagent_containers/syringes.dm
#	code/modules/shuttles/shuttle.dm
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/wildwest.dm
#	maps/southern_cross/items/clothing/sc_head.dm
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
 2018-03-31 09:20:59 -04:00
Leshana
15936a9eb1 Fixes Runtime in logging.dm,61 2018-03-29 21:05:53 -04:00
Neerti
70ac478aea Merge pull request #5065 from VOREStation/vs-port-3204 
[PORT] Revamp logging for consistency
 2018-03-20 21:13:47 -04: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
elgeonmb
874ef860f0 terminus is now not just serial-numbers-filed-off Spacer 
its now part dutch, part lojban. turns out Lojban looks exactly like "humans tried to reverse-engineer an alien language and pasted over the gaps with Banthu or whatever"
 2018-03-14 20:26:49 -07:00
Arokha Sieyes
73838e0a62 POLARIS: Revamp logging to be consistent 2018-03-13 18:20:58 -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
2c9bdf3ae4 POLARIS: Revamp logging to be consistent 2018-03-10 17:18:09 -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
686c601e24 Further translator tweaks 2018-02-04 13:56:25 -05:00
Cyantime
2ce91bceef Allows silicons to use the added languages 2017-11-29 21:44:20 -05:00
Cameron Lennox
15a6472d14 Pol Sync 2017-10-08 17:44:25 -04:00
elgeonmb
77aadf1d4a strips special characters from Skrellian 2017-10-01 19:12:44 -07:00