shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,271 Commits 5 Branches 0 Tags
0c9bf019d7f7b2c291e04469a40ffb8e2ec85dfe
Commit Graph

42271 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot 0c9bf019d7 Automatic changelog generation for PR #14506 [ci skip] 2021-03-27 02:34:18 -05:00
silicons 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
silicons 26b011bb8b Merge pull request #14509 from R3dtail/patch-5 
Adjusts blackmarket uplink
 2021-03-27 01:34:02 -06:00
silicons 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
silicons 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
silicons 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
silicons 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
silicons 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
silicons 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
silicons 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
silicons 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
DeltaFire 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
CuteMoff dd295d20c2 Merge branch 'master' into Plasmaispogtake2 2021-03-25 10:44:12 -04:00
CuteMoff 3efce37fd9 Update mineral.dm 2021-03-25 10:32:13 -04:00
CuteMoff 7265724c5b Update basemats.dm 2021-03-25 10:29:56 -04:00
Putnam 899b94f0f3 Made threat a subsystem instead of dynamic-attached. 2021-03-24 23:44:37 -07:00
R3dtail 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
R3dtail 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
R3dtail 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
silicons 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
silicons 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
silicons 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
silicons 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
silicons e7e13a8e47 Merge pull request #14499 from DeltaFire15/get-out-bot 
Time to stuff the fix-feature bot back into its locker
 2021-03-24 19:22:28 -06:00
Putnam ebb233ab36 More supernova adjustments 2021-03-24 18:21:26 -07:00
silicons 73c0b9263b Merge pull request #14508 from LetterN/BEGONE-QDEL 
Properly fixes cargo console hacking
 2021-03-24 19:21:22 -06:00
Changelogs cfd95c68da Automatic changelog compile [ci skip] 2021-03-25 00:08:13 +00:00
necromanceranne 79de55c58c First part of the largescale shield cleanup, including ensuring shields respect their various counters and strengths appropriately. 2021-03-25 09:07:52 +11:00
R3dtail 32be7ecabd Adjusts blackmarket uplink 
Removes bone spears from the uplink, and makes EMP grenades rarer and more expensive
 2021-03-24 16:53:41 -05:00
CitadelStationBot 0ded71d196 Automatic changelog generation for PR #14483 [ci skip] 2021-03-24 00:47:47 -05:00
DeltaFire 086bb75006 Merge pull request #14483 from zeroisthebiggay/patch-6 
makes strained muscles slightly less absurd by adding a proper chemical slowdown
 2021-03-24 06:47:45 +01:00