Commit Graph
40152 Commits
Author SHA1 Message Date
NovacatandGitHub 2dac28c26b Merge pull request #9773 from VOREStation/upstream-merge-7856
[MIRROR] Lobby Improvements
2021-03-09 17:32:41 -05:00
NovacatandGitHub 58859d2d8e Merge pull request #9887 from Sharkmare/patch-6
Shadekin Trait apply bugfix
2021-03-09 17:32:23 -05:00
NovacatandGitHub 59abfcb084 Merge pull request #9854 from Verkister/patch-38
Makes drag-drop bodyjacking not break aghost bonds
2021-03-09 17:32:04 -05:00
SharkmareandGitHub 7e314656b6 Shadekin Trait apply bugfix
Apparently, I somehow missed this
2021-03-09 23:21:32 +01:00
NovacatandGitHub b39a89cfe7 Update new_newspaper.dm 2021-03-09 17:21:28 -05:00
NovacatandGitHub 2db0627540 Update newscaster.dm 2021-03-09 17:20:55 -05:00
NovacatandGitHub 8a2dddef3a Merge pull request #9765 from VOREStation/upstream-merge-7902
[MIRROR] Ports TGUI Security Stuff
2021-03-09 17:17:31 -05:00
NovacatandGitHub f707e88fa5 Update newscaster.dm 2021-03-09 17:15:44 -05:00
NovacatandGitHub 64a99f4437 Update newscaster.dm 2021-03-09 17:06:56 -05:00
NovacatandGitHub 6abf14d67d Update newscaster.dm 2021-03-09 17:01:56 -05:00
NovacatandGitHub 9f44c1ffec Update new_player.dm 2021-03-09 17:00:40 -05:00
NovacatandGitHub c5566a0045 Update brigdoors.dm 2021-03-09 16:55:34 -05:00
NovacatandGitHub d1e8ff9022 Update security.dm 2021-03-09 16:54:00 -05:00
NovacatandGitHub bc99e58b3e Update prisoner.dm 2021-03-09 16:53:27 -05:00
NovacatandGitHub 4e5a8041e8 Merge pull request #9620 from VOREStation/upstream-merge-7811
[MIRROR] Industrial Expansion
2021-03-09 16:51:57 -05:00
NovacatandGitHub 465af6003a Update protolathe.dm 2021-03-09 16:41:34 -05:00
NovacatandGitHub dd27a8b7a0 Update circuitprinter.dm 2021-03-09 16:39:04 -05:00
NovacatandGitHub 817d32c101 Update mech_fabricator.dm 2021-03-09 16:38:38 -05:00
NovacatandGitHub a5bb3c3a5a Update mech_fabricator.dm 2021-03-09 16:38:18 -05:00
Unknown 9ff261efca Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7835 2021-03-09 16:03:42 -05:00
NovacatandGitHub 60a44581c5 Update circuits.dm 2021-03-09 15:59:53 -05:00
NovacatandGitHub 7fcb6e2f1a Update mine_turfs.dm 2021-03-09 15:55:46 -05:00
NovacatandGitHub 139800d6f2 Update autolathe.dm 2021-03-09 15:52:26 -05:00
Unknown 190b805cad this sucks 2021-03-09 15:49:07 -05:00
NovacatandGitHub 83853694dd Update material_recipes.dm 2021-03-09 15:31:39 -05:00
NovacatandGitHub 547631201f Update material_recipes.dm 2021-03-09 15:25:29 -05:00
NovacatandGitHub a4dfb9c97b Merge branch 'master' into upstream-merge-7756 2021-03-09 15:24:53 -05:00
NovacatandGitHub 465b3ed92f Merge pull request #9869 from VOREStation/upstream-merge-7921
[MIRROR] Adds a modular armour version of the explorer suit and adds sprites to specialist armour
2021-03-09 15:16:52 -05:00
NovacatandGitHub cc7f72a991 Merge branch 'master' into upstream-merge-7756 2021-03-09 15:11:54 -05:00
NovacatandGitHub ea1594ff63 Update material_recipes.dm 2021-03-09 15:10:44 -05:00
NovacatandGitHub 576edef644 Update autolathe.dm 2021-03-09 15:08:46 -05:00
NovacatandGitHub a6d4617863 Merge pull request #9884 from VOREStation/upstream-merge-7954
[MIRROR] Chirp chirp
2021-03-09 12:30:56 -05:00
NovacatandGitHub bb94127a6f Merge pull request #9881 from Sharkmare/Carbonkin-Content-update
Carbonkin Content port + Trait whitelisting
2021-03-09 11:50:02 -05:00
NovacatandGitHub ac1bcf47e6 Merge pull request #9883 from Heroman3003/idlesmsssg
Adds ability to set up and edit idle bellymode messages
2021-03-09 11:29:18 -05:00
NovacatandGitHub 1c886a605f Update emote.dm 2021-03-09 11:24:25 -05:00
SchnayyandVirgoBot 5df83792ac Merge pull request #7954 from PrismaticGynoid/chirpchirp
Chirp chirp
2021-03-09 09:49:21 -05:00
Heroman f7f27e2852 Adds ability to set up and edit idle bellymode messages 2021-03-09 20:28:41 +10:00
Sharkmare ae25f2ba32 typofix2
small teeny tiny oversight
2021-03-09 07:38:40 +01:00
Sharkmare 2e2c01a60f Typofix 2021-03-09 07:34:18 +01:00
Sharkmare 183d89e0b0 Adding the rest of the unarmed attacks
Overlooked the other default unarmed attacks shadekin get, adding those now.
2021-03-09 07:29:15 +01:00
7d89f07776 Update code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
2021-03-09 07:27:53 +01:00
SchnayyandVirgoBot 24435fb1b0 Merge pull request #7849 from Greenjoe12345/teshchair
Adds some new wheelchair types
2021-03-09 01:14:49 -05:00
Sharkmare d6ea007a37 Removing comments 2021-03-09 07:06:13 +01:00
Sharkmare 3e859092b3 Carbonkin Content port + Trait whitelisting
Ports over my carbonkin content update that brings carbon kin mostly on the same level as mob kin.
Also ports the whitelist system so people dont have to write out EVERY species name in cases like this.

Whats it add tho?
Rebalances phase shifting:
Phase shifting is a pretty polarizing ability, it now is more forgiving for stealth uses but has a counter in becoming more costly with people and light level.

Stat blocks of all kin have been revisedd based on the flavor messages of the mob variants.

Tasers and other electricity sources now affect kin, this is the only immunity being removed and should help with SEC interaction.

Adds a new attack "syhon strike" this is mostly for the aggressive kins, if using syphon strike on hit it will take the damage you dealt and convert it into energy, this only works against carbons as example punching punpun restores around 4 energy

As a last note all of the Shadekin Adaptopn color traits lock your eye color into the respective color. So if you take Red adaption you will be immediatley identifiable as a red adapted kin since your eyes will in fact always be red.
2021-03-09 04:24:01 +01:00
NovacatandGitHub dde17fefb2 Merge pull request #9876 from VOREStation/upstream-merge-7953
[MIRROR] Fixed/generalized loadout implants.
2021-03-08 11:52:46 -05:00
NovacatandGitHub fcc45a8c41 Merge pull request #9865 from Heroman3003/sizespace-suit
Adds HYPER suit
2021-03-08 11:05:22 -05:00
NovacatandGitHub e6f50c920a Merge pull request #9868 from Novacat/nova-pathfinder
Gateway for Heads, Pilot to Civ
2021-03-08 11:04:18 -05:00
NovacatandGitHub 3d7ccffa0c Update loadout_utility.dm 2021-03-08 11:04:02 -05:00
AtermoneraandVirgoBot 4db820a2da Fixed/generalized loadout implants. 2021-03-08 02:05:32 -05:00
Heroman 5702604b41 Redoes the PR, adds HYPER suit instead 2021-03-08 10:11:10 +10:00