Commit Graph
42298 Commits
Author SHA1 Message Date
siliconsandGitHub 4f3e695afa Merge pull request #14495 from Hatterhat/synth-aug
is it really an augmentation if you're using a synthflesh-grown limb? no, probably not, but what if you could
2021-03-27 01:35:54 -06:00
CitadelStationBot 01a08e9e7c Automatic changelog generation for PR #14434 [ci skip] 2021-03-27 02:35:19 -05:00
siliconsandGitHub a3d0dd6cf1 Merge pull request #14434 from dzahlus/joy
Adds radial skin menu to joy mask, pensive, angry, flushed
2021-03-27 01:35:18 -06:00
CitadelStationBot cd158b4c5d Automatic changelog generation for PR #14501 [ci skip] 2021-03-27 02:34:49 -05:00
siliconsandGitHub b2151ea989 Merge pull request #14501 from Shadow-Quill/RunIconFix
Adds small walk hud icons
2021-03-27 01:34:47 -06:00
CitadelStationBot 0f270f227b Automatic changelog generation for PR #14504 [ci skip] 2021-03-27 02:34:25 -05:00
siliconsandGitHub 4f631c29bb Merge pull request #14504 from zeroisthebiggay/tritails
i hate kitsune players so here i am porting triple kitsune tails from VORE fuck you
2021-03-27 01:34:23 -06:00
CitadelStationBot 0c9bf019d7 Automatic changelog generation for PR #14506 [ci skip] 2021-03-27 02:34:18 -05:00
siliconsandGitHub ee4f019459 Merge pull request #14506 from timothyteakettle/loadout-tab-defines
fixes character previews but does it using defines (thanks zero)
2021-03-27 01:34:16 -06:00
CitadelStationBot 0abb461c50 Automatic changelog generation for PR #14509 [ci skip] 2021-03-27 02:34:04 -05:00
siliconsandGitHub 26b011bb8b Merge pull request #14509 from R3dtail/patch-5
Adjusts blackmarket uplink
2021-03-27 01:34:02 -06:00
siliconsandGitHub ec11627ad0 Merge pull request #14510 from Putnam3145/supernova-further-adjust
More supernova adjustments
2021-03-27 01:33:57 -06:00
CitadelStationBot 59ab104b15 Automatic changelog generation for PR #14511 [ci skip] 2021-03-27 02:33:49 -05:00
siliconsandGitHub ea797787bd Merge pull request #14511 from R3dtail/patch-6
Removes Ichor Crates from chest rolls
2021-03-27 01:33:48 -06:00
CitadelStationBot dbf7efe774 Automatic changelog generation for PR #14512 [ci skip] 2021-03-27 02:33:37 -05:00
siliconsandGitHub ce8342ed92 Merge pull request #14512 from R3dtail/patch-8
Gives the Blackmarket Uplink a description
2021-03-27 01:33:35 -06:00
CitadelStationBot ef0dd2e727 Automatic changelog generation for PR #14513 [ci skip] 2021-03-27 02:33:29 -05:00
siliconsandGitHub bdbb33842e Merge pull request #14513 from Putnam3145/chaos-for-secret
Makes threat a subsystem instead of dynamic-attached
2021-03-27 01:33:27 -06:00
CitadelStationBot d53f930baa Automatic changelog generation for PR #14515 [ci skip] 2021-03-27 02:32:48 -05:00
siliconsandGitHub 8a5d87725b Merge pull request #14515 from CuteMoff/Plasmaispogtake2
Lets try again, Plasma Ingots (Fucked up the first time)
2021-03-27 01:32:47 -06:00
siliconsandGitHub 07484e53aa Merge pull request #14516 from DeltaFire15/cc-headmessages-again
Once again makes all heads able to message centcom
2021-03-27 01:32:10 -06:00
CitadelStationBot b8a6987ffa Automatic changelog generation for PR #14518 [ci skip] 2021-03-27 02:31:58 -05:00
siliconsandGitHub bf382f490c Merge pull request #14518 from necromanceranne/shield_explodies_fix
Shields: Changes, additional flags, bug fixes, sprites
2021-03-27 01:31:55 -06:00
siliconsandGitHub e3c77d1125 Merge pull request #14529 from Hatterhat/sawed-inhands-grmbl
[speedmerge pls @silicons] god i really hate typos
2021-03-26 22:10:11 -06:00
Hatterhat 61af4108ea i don't wanna talk about it 2021-03-26 23:06:00 -05:00
Changelogs 31fb065c2a Automatic changelog compile [ci skip] 2021-03-26 00:08:43 +00:00
CitadelStationBot f72ef06e82 Automatic changelog generation for PR #14517 [ci skip] 2021-03-25 16:59:09 -05:00
DeltaFireandGitHub 072d52307c Merge pull request #14517 from timothyteakettle/slime-delimb
slimes can be delimbed
2021-03-25 22:59:07 +01:00
necromanceranne 2368968c66 Ports #42721 which happened to resolve this already 2021-03-26 08:45:14 +11:00
necromanceranne 84223c65f5 Adds the shield flags to the ratvaran shield, adds the remaining sprites for the kinetic/energy/holo shields 2021-03-26 07:07:48 +11:00
Timothy Teakettle 6536dc4ecd Update _bodyparts.dm 2021-03-25 18:24:57 +00:00
Timothy Teakettle f113844c41 Update _bodyparts.dm 2021-03-25 18:22:56 +00:00
DeltaFire 1e7d4e4335 *snap 2021-03-25 16:53:25 +01:00
CuteMoffandGitHub dd295d20c2 Merge branch 'master' into Plasmaispogtake2 2021-03-25 10:44:12 -04:00
CuteMoffandGitHub 3efce37fd9 Update mineral.dm 2021-03-25 10:32:13 -04:00
CuteMoffandGitHub 7265724c5b Update basemats.dm 2021-03-25 10:29:56 -04:00
Fabian 2c0ffca75c Update miscellaneous.dm 2021-03-25 14:26:18 +01:00
Putnam 899b94f0f3 Made threat a subsystem instead of dynamic-attached. 2021-03-24 23:44:37 -07:00
a8c6e2ee40 Update code/modules/cargo/blackmarket/blackmarket_uplink.dm
I never said I was good with words.

Co-authored-by: Hatterhat <31829017+Hatterhat@users.noreply.github.com>
2021-03-25 00:05:10 -05:00
R3dtailandGitHub a89fb1087c Update blackmarket_uplink.dm
Gives the item a description and actually gives somewhat of an idea of what it does and how to use it
2021-03-24 22:46:12 -05:00
R3dtailandGitHub 0b3773163c Removes Ichor Crates from chest rolls
Does what it says on the tin
2021-03-24 22:20:09 -05:00
Putnam ac432bdd25 remember to compile before sending commits 2021-03-24 18:31:06 -07:00
CitadelStationBot 362fb9a848 Automatic changelog generation for PR #14480 [ci skip] 2021-03-24 20:25:27 -05:00
siliconsandGitHub 32797e0446 Merge pull request #14480 from BlueWildrose/sensorydetail
Adds suit sensor damage, clothing damage changes
2021-03-24 19:25:24 -06:00
CitadelStationBot d4ed7968dd Automatic changelog generation for PR #14505 [ci skip] 2021-03-24 20:24:00 -05:00
siliconsandGitHub d58697c78d Merge pull request #14505 from timothyteakettle/the-most-important-pr
the loadout now recognises collars as polychromic items
2021-03-24 19:23:58 -06:00
CitadelStationBot 7869a5da75 Automatic changelog generation for PR #14507 [ci skip] 2021-03-24 20:23:04 -05:00
siliconsandGitHub 0845840f5e Merge pull request #14507 from CuteMoff/thisismydiamondsword
Added "Diamond Ingots" for Blacksmithing
2021-03-24 19:23:02 -06:00
CitadelStationBot 3164c2ace1 Automatic changelog generation for PR #14497 [ci skip] 2021-03-24 20:22:39 -05:00
siliconsandGitHub 602140af99 Merge pull request #14497 from Hatterhat/lever-guns
.38 lever-action rifles but not actually implemented
2021-03-24 19:22:36 -06:00