Commit Graph

1500 Commits

Author SHA1 Message Date
Thalpy
53e9c140cf Merge pull request #22 from Citadel-Station-13/master
YARR
2019-08-06 16:08:16 +01:00
Ghommie
8978f0ecf9 Defaults the teleportation forceMove arg to TRUE. 2019-08-05 18:19:48 +02:00
Thalpy
5795f6bbe2 Merge branch 'master' into master 2019-08-05 09:09:36 +01:00
kevinz000
aea2f6f523 Merge pull request #8900 from Seris02/spaceruinsyee
Abductor Replication Lab space ruin - take 2
2019-08-05 00:55:40 -07:00
kevinz000
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
kevinz000
53a9f3ac51 Merge pull request #9036 from Linzolle/invisiclothes
fixes combat gloves plus having no icon, allows for shoes to have their item_state set to use a differently named icon on mobs
2019-08-04 19:09:36 -07:00
kevinz000
27b3cb6656 Merge pull request #9018 from Ghommie/Ghommie-cit171
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
2019-08-04 19:04:59 -07:00
kevinz000
a82f9c011b Merge pull request #9004 from Trilbyspaceclone/Crafting
Ports "Adds helpers for finding martial arts types #42045" as well as "Adds simple framework for learnable crafting recipes #43296"
2019-08-02 00:57:05 -07:00
Linzolle
bc9bca8d04 oh my god 2019-08-02 01:20:32 -05:00
Ghommie
ec2a3ea778 Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception" 2019-07-31 18:56:00 +02:00
Linzolle
db198ba217 fix leg sweep 2019-07-31 01:17:12 -05:00
TrilbySpaceClone
7ca32cd97f port 2 2019-07-29 07:28:38 -04:00
TrilbySpaceClone
606639ce23 part 1 fixing shit 2019-07-29 05:52:49 -04:00
Fermi
d080446a77 Merge branch 'pr/20' 2019-07-28 23:28:19 +01:00
deathride58
a373899ae0 [s] fixes major server crash exploit vector involving notes 2019-07-28 13:08:02 -04:00
kevinz000
1028fe458a Merge pull request #8909 from Ghommie/Ghommie-cit143
Fixes named arg Knockdown calls.
2019-07-22 20:17:30 -07:00
Thalpy
15ab1a26a4 Merge branch 'master' into master 2019-07-21 01:50:41 +01:00
kevinz000
08fd6af7fc Merge pull request #8830 from Ghommie/Ghommie-cit114
Ports the toggleable dark mode to the game!
2019-07-20 11:57:13 -07:00
kevinz000
08d9732fb8 Merge pull request #8925 from BurgerLUA/Autolathe-Fix
Makes the autolathe shock wire actually shock you
2019-07-20 11:49:39 -07:00
BurgerLua
b2379198aa Makes the autolathe shock wire actually shock you lmao 2019-07-19 02:01:16 -07:00
deathride58
77360259ae Merge pull request #8855 from Citadel-Station-13/kevinz000-patch-15
Fixes and buffs nano-boost symptom
2019-07-17 17:53:02 -04:00
deathride58
7e12cfc9ff Merge pull request #8868 from Citadel-Station-13/kevinz000-patch-57
Nanites in non /livings are no longer immune to EMPs
2019-07-17 17:51:15 -04:00
deathride58
d7cbbfc8a4 Merge pull request #8866 from Citadel-Station-13/kevinz000-patch-54
Fixes nanites getting instant nuked by EMPs and shocks and removes the random drain in favor of a scaled drain
2019-07-17 17:48:38 -04:00
Ghommie
ee32e1680f Ports "Replaces radio channel names and keys with defines" 2019-07-17 00:52:41 +02:00
Ghommie
b6f10c96a7 Modularity was a mistake. 2019-07-16 21:05:12 +02:00
Thalpy
9c7b1dee97 Merge branch 'master' into master 2019-07-15 21:23:04 +01:00
Seris02
59f45d3e35 adds abductor replication lab with advanced tools 2019-07-15 15:18:04 +08:00
kevinz000
102bede4be Merge pull request #7544 from deathride58/nanitepoolnerf
Nerfs nanite pools
2019-07-14 14:15:53 -07:00
Fermi
8d12d0f017 I am very smart 2019-07-13 20:02:53 +01:00
Thalpy
4c4dbd0e17 Merge branch 'master' into master 2019-07-13 19:33:46 +01:00
Ghommie
129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
kevinz000
e5d445c4d3 Merge pull request #8846 from Ghommie/Ghommie-cit122
Rubber toolboxes.
2019-07-12 07:35:25 -07:00
kevinz000
c30a3aafb6 Update nanites.dm 2019-07-10 22:49:31 -07:00
kevinz000
db05432778 Update nanites.dm 2019-07-10 22:44:21 -07:00
kevinz000
2995b22907 Update nanites.dm 2019-07-10 22:38:43 -07:00
Fermi
ce390fb595 Tweaks to MK 2019-07-09 23:27:37 +01:00
kevinz000
7bca0c6d88 Update nanites.dm 2019-07-08 23:48:22 -07: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
c418312cc6 Merge branch 'master' into master 2019-07-09 05:33:09 +01:00
Ghommie
2af4cfa0ce component fixes. 2019-07-08 15:09:18 +02:00
Ghommie
9043402483 Rubber toolboxes. 2019-07-08 14:34:14 +02:00
kevinz000
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
kevinz000
e227d5575c Merge pull request #8825 from Ghommie/Ghommie-cit110
Ports "Fixes default supplypods exploding their contents" & co.
2019-07-07 02:34:47 -07:00
kevinz000
fd592e5815 Merge pull request #8827 from Ghommie/Ghommie-cit112
Ports "Makes looping sounds use client time"
2019-07-07 02:31:10 -07:00
Thalpy
cc39c9f896 Merge branch 'master' into master 2019-07-06 16:03:17 +01:00
Ghommie
3ca31617aa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit114 2019-07-05 23:06:57 +02:00
Ghommie
03315d1cbb Ports a toggleable darkmode to the game! 2019-07-05 22:29:50 +02:00
kevinz000
77743c9a0f Merge pull request #8794 from Ghommie/Ghommie-cit100
Fixes the uplink category indexing.
2019-07-05 06:56:22 -07:00
Ghommie
7be9305b03 Ports "Makes looping sounds use client time" 2019-07-04 22:50:11 +02:00
Ghommie
b41e289db3 Ports "Fixes default supplypods exploding their contents" & co. 2019-07-04 22:35:13 +02:00