cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-26 01:53:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,216 Commits 9 Branches 0 Tags
a0ab995551a0e8cb15b8ca5f0026aa5f21698cbc
Commit Graph

230 Commits

Author SHA1 Message Date
izac112
7f4affbb73 More fluff and language fix 2017-09-02 17:34:36 +02:00
Yoshax
19c047a4ae Removes whitelist requirements from Daemon and Enochian 2017-08-31 22:33:31 +01:00
Kelshark
f2f35697fb Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/datums/supplypacks/engineering.dm
#	code/modules/mob/living/silicon/robot/robot_modules_vr.dm
#	code/modules/vore/appearance/spider_taur_powers_vr.dm
#	code/modules/vore/resizing/resize_vr.dm
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi
 2017-08-18 08:14:12 -04:00
killer653
468e73c7f3 Polaris sync 2017-08-06 19:07:17 -04:00
Anewbe
6525e2cf73 Comms can speak EAL 2017-07-24 20:45:41 -05: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
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
Anewbe
1442528bfb Sam is no longer in the list of words for Siik 2017-04-23 11:08:29 -05:00
Anewbe
bf7dce79cc Unathi mechanical changes (#3256) 
* Unathi changes

* Tweaks blurb

* Alcohol tweaks

* Age tweak

* Slowdown

* Adds Unathi to the codex

* Fixes Unathi Organs, adds sprites

* Fixed the changelog

* Sprite and language tweaks, Unathi
 2017-04-19 13:42:51 -04:00
Kelshark
8ee9f436ea Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/objects/items/weapons/tools.dm
#	code/modules/mob/dead/observer/say.dm
#	config/custom_items.txt
#	vorestation.dme
 2017-04-13 19:43:56 -04:00
Arokha Sieyes
c57e6e75b7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-smallsync 
# Conflicts:
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm

Line ending changes?
 2017-04-02 23:25:59 -04:00
Atermonera
e7fb196a26 Restricts animal languages 2017-04-02 10:16:15 -07:00
Atermonera
971cd2da30 Translators don't understand animals and other languages that recorders can't record. 2017-04-01 16:48:01 -07:00
Atermonera
85c78001cb Several simple_animals have their own languages, with custom syllables. 2017-04-01 16:46:28 -07:00
Kelshark
ea669886d0 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/mob/language/station_vr.dm
#	code/modules/surgery/robotics.dm
#	config/custom_items.txt
 2017-03-17 19:28:02 -04:00
Arokha Sieyes
9a8b0911c6 Angel and Demon languages 
Not actually MAGICAL angels and demons, I believe, just they resemble them and are spacefaring races and so sometimes end up matching various religious texts in terms of appearance and habit.

Can we please stop adding whitelisted languages? It's dumb. We have ONE person whitelisted for gutter, and a lot of good it does them since nobody else has even applied. They'd have to talk to someone with a translator.
 2017-03-13 12:45:03 -04:00
Arokha Sieyes
6e8667e948 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-newpolsync 
# Conflicts:
#	code/game/objects/items/weapons/tanks/tank_types.dm
#	code/modules/events/canister_leak.dm
#	code/modules/gamemaster/actions/canister_leak.dm
 2017-03-13 01:29:01 -04:00
Neerti
11b1185005 Adds Two QOL Say/Emote Features 2017-03-12 09:30:48 -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
JoanRisu
3785bd3700 ~Changes flag for squirrelkin language 
~changes Joan's bag and its icon
+Adds Dhael's gun and permit to her spawnlist
~debug attempt on Crescent Rose's sprite changing code. Also changes sprites.
 2017-03-03 03:39:00 -08:00
Arokha Sieyes
bad7964883 Merge pull request #1023 from VOREStation/eal 
Unwhitelist EAL
 2017-02-23 19:47:03 -05:00
Leshana
3781494933 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 2017-02-23 18:25:37 -05:00
Arokha Sieyes
bcec71ad96 Unwhitelist EAL 
Apparently this was done due to a bug, or prior to something being fixed/added and is not necessary now. To clarify how EAL works:
**Organics: **
- Can take EAL, and UNDERSTAND EAL when it is spoken to them.
- Cannot speak EAL, unless they have the EAL implant
- Can never use the sound emotes (beep, ping, buzz)

**Synthetics: **
- Can take EAL, and SPEAK and UNDERSTAND EAL
- Can use the sound emotes (beep, ping, buzz)

The sound emotes are not tied to EAL in any way (beep, ping, buzz). They are emotes you can perform if you are synthetic.
 2017-02-23 16:38:27 -05:00
nachomeep
e0ef593ce4 Updates language syllables and text. (#3000) 
* Adds a lot of languages.

* Removes the languages I just added.

Instead updates old ones.

* Fixes a minor typo.

* how the hell did i accidentally remove sinta'unathi

Returns that stuff.

* Fixes two things.

* doesnt actually change name length
 2017-02-23 15:17:14 -06: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
27ea27964e Adds and tweaks Vox toys 2017-01-19 21:28:51 -06:00
Anewbe
d53cfc4773 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into theUnboxingBegins 
# Conflicts:
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
#	icons/mob/human_face.dmi
#	icons/mob/suit.dmi
 2017-01-17 22:05:38 -06:00
Anewbe
2d72e609d1 Moves languages to use more defines. Redoes Diona splitting 2017-01-14 22:47:12 -06:00
Anewbe
2c86a0a465 Returns the Vox, who now breath Phoron 2017-01-06 17:49:39 -06:00
Kelshark
04821c6cc5 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/mob/language/station_vr.dm
 2016-12-18 00:56:03 -05:00
JoanRisu
0ecd0a51be Merge branch 'master' of https://github.com/VOREStation/VOREStation into Fluff_Items_worshop 2016-12-12 18:37:33 +09:00
JoanRisu
2ca24521d9 fixing PDAs and adding squirrelkin language. 2016-12-12 18:36:12 +09:00
Kelshark
d3d7b916e0 Merge branch 'master' of https://github.com/Repede/YawnWiderStation 2016-12-11 20:04:34 -05:00
izac112
a6e2868cba Merge pull request #1 from izac112/Fluffthing 
Fixed borg resize and added Generals and Dragons Limbs
 2016-12-10 21:36:46 +01:00
killer653
0c73b9da2e Polaris December Sync 2016-12-10 09:51:11 -05:00
MagmaRam
95aa0d152d Finally got around to implementing Zuhayr's suggestion. 2016-12-06 20:16:42 -06:00
MagmaRam
c5b77fcf9e Adds an implant that allows humans to speak EAL. 
It's available in the loadout for 2 points.
 2016-12-01 22:22:46 -06:00
ForFoxSake
db63646679 Fixes language ability checks. Adds EAL to more synthetics. 2016-11-25 02:44:06 +00:00
MagmaRam
ac81408cf9 Merge pull request #2724 from Anewbe/signing 
Ports sign language
 2016-11-14 14:51:48 -06:00
Anewbe
5e9b885b43 Actually fixes the stuff 2016-11-12 11:29:23 -06:00
Anewbe
b8018065bc Ports sign language 2016-11-11 15:43:03 -06:00
Anewbe
da90b87802 Ports Bay's tape recorders 2016-11-11 00:10:55 -06:00
Eearslya Sleiarion
868413c880 Polaris Sync October 9th (#633) 2016-10-09 18:55:29 -04:00
Anewbe
c9c588b922 An Officer walks into a bar bar bar 2016-09-28 22:23:00 -05:00
Eearslya Sleiarion
7fffcaa474 Add additional language whitelists (#591) 2016-09-25 18:43:36 -04:00
killer653
d1afae6d06 Polaris Sync & bugfix 
- Polaris Sync
- Fixes bug being unable to pick up micros
- Fixes all conflicts that came with sync
 2016-08-17 22:02:05 -04:00
Cameron653
a8e133759f Emergency hotfix (#472) 
Emergency hotfix for alien whitelist
 2016-08-14 02:28:18 -04:00