Hawk_v3
3c8cd11eac
Reupdated Station 1 map
2019-10-24 21:57:58 +01: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
Hawk_v3
b22f2284fe
Merge remote-tracking branch 'upstream/master'
2019-09-23 20:55:18 +01:00
Unknown
10f290106c
Ports pan-slavic from Baystation
2019-09-18 15:57:30 -04:00
Hawk_v3
bc7ea8379a
Merge remote-tracking branch 'upstream/master'
2019-07-02 17:54:29 +01: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
Hawk_v3
41f0bd9f6d
Merge remote-tracking branch 'upstream/master'
2019-04-14 19:44:13 +01:00
Hawk_v3
e290515df7
Fixes Language Break for Vedahq, the Zaddat Language
...
Changed Sergal from z to e
2019-04-14 18:53:38 +01:00
Heroman3003
ea1b347a40
Restricts monkey languages, changes the keys on existing
2019-04-08 12:02:16 +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
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
Hawk_v3
76d67fe912
Merge remote-tracking branch 'upstream/master'
2018-12-04 03:29:31 +00: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
Hawk_v3
317039b60e
Merge remote-tracking branch 'upstream/master'
2018-08-21 21:01:43 +01: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
Hawk_v3
22f600c51d
Merge remote-tracking branch 'upstream/master'
2018-07-21 22:56:04 +01:00
Hawk_v3
e6f05b03eb
Comments out Tajr
...
Because it's Alai now or something yet the file didn't change?
2018-07-18 12:46:24 +01:00
Repede
1b5cb2bafa
Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
2018-07-17 20:30:33 -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
Repede
223aa0b68f
Removes gutter whitelist
2018-07-08 11:49:42 -04:00
Repede
123050bcd0
Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
...
# Conflicts:
# code/game/jobs/job/civilian_chaplain.dm
# code/modules/mob/language/station_vr.dm
2018-07-08 11:38:06 -04:00
Hawk_v3
c96ed7457c
Dewhitelisted Languages, removed Vore duplications
...
As station.
Demon is now Daemon.
Angel is Enochian. If you're wondering where your language has gone.
2018-07-07 18:25:26 +01: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
Repede
d4bb48b2f6
Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
...
# Resolved Conflicts:
# code/game/machinery/cloning.dm
# config/custom_items.txt
# icons/mob/vore/taurs_vr.dmi
# maps/tether/tether-05-station1.dmm
# maps/tether/tether-06-station2.dmm
2018-06-29 09:58:53 -04:00
Unknown
c691ad5b8d
Ports Siik'Tajr from Baystation
...
Tail Sign language!
2018-06-13 02:13:31 -04:00
Repede
f772d7622c
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# config/custom_items.txt
2018-06-10 21:19:07 -04: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
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
