Commit Graph

28420 Commits

Author SHA1 Message Date
silicons ce8342ed92 Merge pull request #14512 from R3dtail/patch-8
Gives the Blackmarket Uplink a description
2021-03-27 01:33:35 -06: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
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
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
Hatterhat 61af4108ea i don't wanna talk about it 2021-03-26 23:06:00 -05:00
Blue Wildrose f6b3ef0893 probably a better way of setting this up 2021-03-26 20:11:26 -07:00
necromanceranne 8091844a1c Urist McGreyshit regains their grip on the ! 2021-03-27 14:06:41 +11:00
Blue Wildrose ac0d261959 can't repair unless absolutely broken no more 2021-03-26 20:03:19 -07:00
LetterN 9c3c9861ab null-too-early 2021-03-27 08:31:48 +08:00
SandPoot 0994a37af5 upload files 2021-03-26 11:05:36 -03:00
Hatterhat c56c730c56 bruh 2021-03-25 23:56:01 -05:00
Hatterhat c8249c47cd uhh that's kinda fucked up bossman 2021-03-25 22:34:54 -05:00
qweq12yt a4f0b749de god damn GRAMMAR 2021-03-25 20:18:59 -03:00
qweq12yt 5e28d34a15 seed price adjustment 2021-03-25 20:04:51 -03:00
qweq12yt 780c401d5c commented out rocket_boots, check comments
i could port it but i would like to pass it through other players/maintainers
2021-03-25 19:05:22 -03:00
necromanceranne 2368968c66 Ports #42721 which happened to resolve this already 2021-03-26 08:45:14 +11:00
qweq12yt 14e066fe61 oops left something behind, sorry 2021-03-25 18:44:28 -03:00
qweq12yt d6ab576530 ported rocket boots 2021-03-25 18:17:47 -03:00
qweq12yt ae44649950 ported the clear PDA 2021-03-25 18:15:48 -03:00
qweq12yt 13033bd7bb availability for items tweaked, internals box added 2021-03-25 18:09:35 -03:00
qweq12yt 9015b22f62 removed wind-up gun and derringer from code
they were not ready, this branch is now more focused on adding stuff that is on the game already
2021-03-25 17:34:23 -03:00
qweq12yt f784b849b8 removed derringer, it is not ready yet 2021-03-25 17:27:11 -03: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
qweq12yt a22cfe5650 chances to appear, some price changes 2021-03-25 16:53:32 -03: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
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
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
qweq12yt d856a1d2e0 added more items, stock/price/chance balance 2021-03-25 00:35:47 -03:00
R3dtail 0b3773163c Removes Ichor Crates from chest rolls
Does what it says on the tin
2021-03-24 22:20:09 -05:00
keronshb b06c15ab30 Update traitordevices.dm
Fixed
2021-03-24 21:32:31 -04:00
Putnam ac432bdd25 remember to compile before sending commits 2021-03-24 18:31:06 -07: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
Putnam 7190ef5d62 why did i do it that way? 2021-03-24 18:25:12 -07:00
silicons 0845840f5e Merge pull request #14507 from CuteMoff/thisismydiamondsword
Added "Diamond Ingots" for Blacksmithing
2021-03-24 19:23:02 -06: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
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
Putnam 18ce504f06 oh and this should not go up infinitely 2021-03-24 17:24:13 -07:00
Putnam 254187bc2e it's not a global proc 2021-03-24 17:23:21 -07:00
necromanceranne 45340ef1ac Makes shove off-balancing remove any active item, not just guns. Makes baton knockdowns not go on cooldown from normal hits, makes baton offbalance trait share a duration. Gives the stunprod a little more oomph to keep it comparable to unarmed. 2021-03-25 09:27:33 +11: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