Fermiand Fermi
888906b4e7
Fixes Mk1 !
2019-09-27 11:12:53 +01:00
Fermiand Fermi
97fa05f446
Merge branch 'master' into tg-Organ-port
2019-09-21 14:01:52 +01:00
Fermiand Fermi
a3ae942c1d
Okay.. I think this fixes it all.
2019-09-21 11:13:20 +01:00
kevinz000 and GitHub
5608d37fd5
Merge pull request #9263 from Trilbyspaceclone/batter_up
...
Adds a new traitor bundle - Synda Major Leage Player
2019-09-21 01:56:41 -07:00
Fermiand Fermi
a08c1229d6
OKAY now I'm done I think.
2019-09-21 09:31:53 +01:00
Fermiand Fermi
4b44b31aa3
Okay, feature done
2019-09-21 08:24:46 +01:00
Fermiand Fermi
2b80998f64
Adds: cybernetic_heart_u and VV viewer.
2019-09-21 04:19:34 +01:00
Fermiand Fermi
b9a2a5ce38
Oops
2019-09-19 15:41:26 +01:00
Fermiand Fermi
a398f64b66
Okay
2019-09-19 15:33:40 +01:00
Fermiand Fermi
587568bf88
Merge branch 'master' into tg-Organ-port
2019-09-19 01:33:15 +01:00
Fermiand Fermi
107dd67cbe
Well it compiles; just synthtissue and TongueLoss now.
2019-09-19 01:14:12 +01:00
Fermiand Fermi
dfa40a4b22
tg Code complete, now to bugtest and clear compile errors.
2019-09-18 23:57:21 +01:00
Fermiand Fermi
c23d6f0113
I missed an earlier port.
2019-09-17 01:08:37 +01:00
Poojawa
94afbbd560
Adding Horn colors, multiple-select legs, and species squash
...
Moths -> Insects. Avians & Aquatics into Mammal -> Anthromorphics. Modular Citadel sprite accessories decommissioned and sorted to my liking. Sprites tweaked on a bunch of critters. Added new wings....
2019-09-11 17:46:17 -05:00
TrilbySpaceClone
0e12a4f8d1
and swing!
2019-09-08 21:39:32 -04:00
Ghommie
24fe7126c4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-08-24 19:05:51 +02:00
kevinz000 and GitHub
96842ed1c3
Merge pull request #9075 from Ghommie/Ghommie-cit184
...
Removes a redunant Remove() from high luminosity eyes.
2019-08-11 10:05:58 -07:00
Ghommie
df5366e911
Removes a redunant Remove() from high luminosity eyes.
2019-08-08 05:06:53 +02:00
Thalpy and GitHub
5795f6bbe2
Merge branch 'master' into master
2019-08-05 09:09:36 +01:00
kevinz000 and GitHub
f8cede1ca8
Merge pull request #8998 from Ghommie/Ghommie-cit167
...
Fixes inactive high luminosity eyes turning back on as soon as you move around.
2019-08-05 00:49:14 -07:00
kevinz000 and GitHub
f1c9a07f6d
Merge pull request #8912 from Ghommie/Ghommie-cit146
...
Ports "Headset Channel Descriptions Are No Longer Hardcoded"
2019-08-04 22:41:49 -07:00
Fermi
18b03f9053
Furranium fixes.
2019-08-01 03:38:06 +01:00
Fermi
fbbc4d8589
Merge branch 'pr/21'
2019-07-29 22:57:40 +01:00
Ghommie
2eda8f2666
Fixes "inactive" high luminosity eyes turning back on as soon as you move around.
2019-07-29 06:13:36 +02:00
Trilbyspaceclone and GitHub
359d0e8531
Update lungs.dm
2019-07-23 01:27:03 -04:00
Thalpy and GitHub
15ab1a26a4
Merge branch 'master' into master
2019-07-21 01:50:41 +01:00
Ghommie
ee32e1680f
Ports "Replaces radio channel names and keys with defines"
2019-07-17 00:52:41 +02:00
Ghommie
676186ee36
Ports "Removes some getflaticon calls from things that don't draw browser interfaces"
2019-07-16 23:15:52 +02:00
Thalpy and GitHub
9c7b1dee97
Merge branch 'master' into master
2019-07-15 21:23:04 +01:00
Ghommie
1e1f8e627f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-07-15 17:33:41 +02:00
Fermi
8d12d0f017
I am very smart
2019-07-13 20:02:53 +01:00
Fermi
6c9f37790b
Fixing bugs from merge conflicts.
2019-07-13 20:02:27 +01:00
Thalpy and GitHub
4c4dbd0e17
Merge branch 'master' into master
2019-07-13 19:33:46 +01:00
Fermi
110f0cbb83
Fixes and making a message clearer so people don't think it's admins.
2019-07-13 19:17:19 +01:00
Ghommie
129ca9d71f
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-13 10:27:39 +02:00
kevinz000 and GitHub
1eaddd3ebf
Merge pull request #8853 from Ghommie/Ghommie-cit125
...
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
2019-07-12 07:34:19 -07:00
Fermi
8f555b0fdd
Reworked Astral, doubled lung damage, fixed lung damage oopsie.
2019-07-10 21:35:47 +01:00
Fermi
ce390fb595
Tweaks to MK
2019-07-09 23:27:37 +01:00
Ghommie
490ae9daf2
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
2019-07-09 07:58:22 +02:00
Thalpy and GitHub
c418312cc6
Merge branch 'master' into master
2019-07-09 05:33:09 +01:00
Fermi
1b3de620f9
BM requests.
2019-07-09 02:44:17 +01:00
deathride58 and GitHub
e56fc559ed
Merge pull request #8748 from Citadel-Station-13/kevinz000-patch-15
...
Raises corpse miasma generation by 5x. Lowers miasma disease chance per mole by 10x. Miasma now does absolutely nothing unless there's enough of it in the air to actually flow into scrubbers so there's no invisible pockets of disease stuck everywhere.
2019-07-08 18:15:20 -04:00
deathride58 and GitHub
42cee552fe
Merge pull request #8709 from Trilbyspaceclone/Fel_port_1
...
Ports "Fixes every issue in the slimes milestone. #44450 "
2019-07-08 18:10:46 -04:00
deathride58 and GitHub
840cfb8ac0
Merge pull request #8818 from Citadel-Station-13/kevinz000-patch-53
...
fixes stimulum by changing one number
2019-07-08 17:54:56 -04:00
Fermi
d870604322
Missed one
2019-07-08 19:59:51 +01:00
Fermi
c3ac34158a
Fixed shock command.
2019-07-08 19:51:10 +01:00
kevinz000 and GitHub
1b4df74efb
Merge pull request #8802 from Ghommie/Ghommie-cit101
...
Ports in RPGs for nuke ops, failsafe uplink codes, some carp plushie exploit fix etc.
2019-07-07 02:39:07 -07:00
Fermi
e84fc73bed
Fixed buffers, SDGF, icons and spelling.
2019-07-07 05:59:21 +01:00
Thalpy and GitHub
8a6e669060
Merge branch 'master' into master
2019-07-04 03:14:29 +01:00
kevinz000 and GitHub
8a4d7afca2
Update lungs.dm
2019-07-03 03:55:27 -07:00