Putnam3145 66a9ce77fb Merge pull request #9964 from GrayRachnid/fixmyblunder ...

Fixes Codewords not changing color and MkUltra enthrall not having the proper hearing_args

2021-01-06 22:14:03 -03:00

..

admin

Merge pull request #10238 from Ghommie/Ghommie-cit478

2021-01-06 15:39:13 -03:00

antagonists

Merge pull request #9964 from GrayRachnid/fixmyblunder

2021-01-06 22:14:03 -03:00

assembly

Merge pull request #9747 from Ghommie/Ghommie-cit329

2021-01-05 16:58:19 -03:00

atmospherics

Merge pull request #10238 from Ghommie/Ghommie-cit478

2021-01-06 15:39:13 -03:00

awaymissions

Changing Nanotrasen to Kinaris where needed

2020-12-31 17:58:25 +00:00

bsql

…

buildmode

…

cargo

Merge pull request #9993 from Ghommie/Ghommie-cit412

2021-01-05 16:54:23 -03:00

chatter

…

client

Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled.

2021-01-05 16:32:02 -03:00

clothing

Merge pull request #10056 from Ghommie/Ghommie-cit430

2021-01-05 16:51:22 -03:00

crafting

…

detectivework

Merge pull request #9983 from Ghommie/Ghommie-cit408

2021-01-05 01:34:16 -03:00

emoji

…

error_handler

…

events

Merge remote-tracking branch 'upstream/master' into reagentsagain

2020-12-18 01:20:57 -03:00

fields

…

flufftext

Destination: improvement

2020-12-09 13:49:04 -03:00

food_and_drinks

Merge pull request #9722 from Ghommie/Ghommie-cit320

2021-01-05 17:23:36 -03:00

games

Merge pull request #9983 from Ghommie/Ghommie-cit408

2021-01-05 01:34:16 -03:00

goonchat

…

holiday

Ports reagents id removal and typepath usage.

2020-12-09 14:32:36 -03:00

holodeck

Merge pull request #10238 from Ghommie/Ghommie-cit478

2021-01-06 15:39:13 -03:00

hydroponics

Merge pull request #10056 from Ghommie/Ghommie-cit430

2021-01-05 16:51:22 -03:00

integrated_electronics

Merge pull request #825 from ArchieBeepBoop/updatesaycode

2021-01-06 14:18:03 +00:00

jobs

Ports "Added TRAIT_DISK_VERIFIER, refactors how fake disk checks work slightly

2021-01-04 02:36:28 -03:00

keybindings

Merge pull request #10356 from deathride58/sprintprefs

2021-01-04 01:51:21 -03:00

language

…

library

…

lighting

…

mapping

Merge pull request #10570 from kevinz000/map_network_helpers

2021-01-06 15:44:06 -03:00

mining

Merge pull request #9983 from Ghommie/Ghommie-cit408

2021-01-05 01:34:16 -03:00

mob

Merge pull request #789 from Tename/boggers

2021-01-07 00:17:31 +00:00

modular_computers

Merge pull request #9983 from Ghommie/Ghommie-cit408

2021-01-05 01:34:16 -03:00

ninja

Ports reagents id removal and typepath usage.

2020-12-09 14:32:36 -03:00

NTNet

…

oracle_ui

Merge pull request #9556 from Linzolle/paper-fix

2020-12-07 22:57:42 -03:00

paperwork

Merge pull request #9983 from Ghommie/Ghommie-cit408

2021-01-05 01:34:16 -03:00

photography

Merge pull request #9983 from Ghommie/Ghommie-cit408

2021-01-05 01:34:16 -03:00

pool

…

power

Merge pull request #10570 from kevinz000/map_network_helpers

2021-01-06 15:44:06 -03:00

procedural_mapping

…

projectiles

Merge pull request #10056 from Ghommie/Ghommie-cit430

2021-01-05 16:51:22 -03:00

reagents

Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled.

2021-01-05 16:32:02 -03:00

recycling

Merge pull request #10238 from Ghommie/Ghommie-cit478

2021-01-06 15:39:13 -03:00

research

Merge pull request #789 from Tename/boggers

2021-01-07 00:17:31 +00:00

ruins

Merge pull request #9993 from Ghommie/Ghommie-cit412

2021-01-05 16:54:23 -03:00

security_levels

…

shuttle

Porting Robustin's Syndicate Infiltrator PR from tee-gee

2021-01-02 16:53:52 -03:00

spells

…

station_goals

Changing Nanotrasen to Kinaris where needed

2020-12-31 17:58:25 +00:00

surgery

Fermichem tweaks: Purity, Astral, RNG, MK, SMilk, SDGF, furranium, hatmium, eigen, nanite.

2021-01-03 05:21:47 -03:00

tgs

…

tgui

…

tooltip

…

unit_tests

…

uplink

Changing Nanotrasen to Kinaris where needed

2020-12-31 17:58:25 +00:00

vehicles

Merge pull request #9983 from Ghommie/Ghommie-cit408

2021-01-05 01:34:16 -03:00

vending

requiem

2021-01-03 20:10:09 -05:00

VR

…

zombie

…