silicons
|
3068accd2b
|
Merge pull request #13082 from Putnam3145/anaphro
Removed (an)aphrodisiacs.
|
2020-08-09 05:39:56 -07:00 |
|
silicons
|
d25daec117
|
Merge pull request #13081 from Putnam3145/ethereals
Ports ethereals from TG
|
2020-08-09 05:39:43 -07:00 |
|
silicons
|
bd65c8efc6
|
Merge pull request #13079 from Hatterhat/parry-text
parry counterattack text now actually shows up
|
2020-08-09 05:37:42 -07:00 |
|
Putnam
|
467f66b2a6
|
Removed crocin/hexacrocin.
|
2020-08-08 00:46:30 -07:00 |
|
Putnam
|
9bb3ba5c5a
|
added ethereals
|
2020-08-08 00:08:43 -07:00 |
|
Hatterhat
|
56bf84abfe
|
parry debug stick
|
2020-08-08 00:48:55 -05:00 |
|
Hatterhat
|
a7d1a0ea48
|
gauze! stacksizes! shit.
|
2020-08-07 18:40:46 -05:00 |
|
silicons
|
6876edbd85
|
Merge pull request #12992 from Hatterhat/rifle-book-pt2
unatomic as shit PR about nukie guns
|
2020-08-06 19:40:09 -07:00 |
|
Lin
|
865a2bf181
|
Merge pull request #13030 from Citadel-Station-13/silicons-patch-71
off balanace
|
2020-08-06 12:32:50 -05:00 |
|
Lin
|
ad4a96c73a
|
Merge pull request #13001 from Citadel-Station-13/silicons-patch-66
makes explosions only recurse one level into storage at full power before dropping 1 level per storage object recursed
|
2020-08-05 19:50:57 -05:00 |
|
Lin
|
c310b1a70e
|
Merge pull request #12997 from silicons/lavastaff
fixes medsprays, sutures/regenmesh, and lavastaves not respecting clickdelay (rip instant chemdump heal on self)
|
2020-08-05 19:43:38 -05:00 |
|
silicons
|
bb8dfa9236
|
Merge pull request #12991 from b1tt3r1n0/I'mAlreadyTracer
I wanna be tracer
|
2020-08-05 15:26:37 -07:00 |
|
silicons
|
3e2ab66afa
|
Update shields.dm
|
2020-08-04 21:34:59 -07:00 |
|
Hatterhat
|
25ab96cf53
|
funny revolver reskins
|
2020-08-03 20:39:06 -05:00 |
|
Timothy Teakettle
|
289c186f32
|
Merge remote-tracking branch 'upstream/master' into wounds-part-2
|
2020-08-02 18:11:07 +01:00 |
|
silicons
|
d4d2e4ae0d
|
Update _storage.dm
|
2020-08-01 21:07:07 -07:00 |
|
silicons
|
20dea7e41f
|
fix
|
2020-08-01 20:45:49 -07:00 |
|
silicons
|
7e0e60c126
|
Merge pull request #12993 from KeRSedChaplain/toyslabfixfortravis
Toyslabfixfortravis
|
2020-08-01 13:31:33 -07:00 |
|
Dan-Neposh
|
44e6b6ccc7
|
I removed the Dread_Ipad, Clockwork Slab reigns supreme
|
2020-08-01 16:18:25 -04:00 |
|
Hatterhat
|
6a5e26eb1c
|
unatomic as shit
|
2020-08-01 12:31:13 -05:00 |
|
silicons
|
e8ec73ba7d
|
Merge pull request #12976 from Hatterhat/durathread-kits
Durathread Reinforcement Kits
|
2020-08-01 03:35:45 -07:00 |
|
silicons
|
30d82d66d1
|
Merge pull request #12939 from Sishen1542/iaa-iaa
Reflavors IAA, removes certain items from IAA uplinks, adds TC stealing functionality to uplinks
|
2020-08-01 02:24:01 -07:00 |
|
CitadelStationBot
|
a2f6a7c207
|
Automatic changelog generation for PR #12979 [ci skip]
|
2020-08-01 00:16:53 -04:00 |
|
Hatterhat
|
6dfdff34ef
|
durathread armor kits
|
2020-07-30 13:38:04 -05:00 |
|
Sishen
|
7fa5ccbd0e
|
fixes slapping uplinks with non uplink items giving runtimes
|
2020-07-29 16:14:01 -06:00 |
|
silicons
|
90d3cff53f
|
Merge remote-tracking branch 'citadel/master' into 12742
|
2020-07-29 11:53:59 -07:00 |
|
Timothy Teakettle
|
9721025582
|
Merge branch 'master' into wounds-part-2
|
2020-07-29 15:47:44 +01:00 |
|
silicons
|
e4148fe4ad
|
Merge remote-tracking branch 'citadel/master' into 12742
|
2020-07-29 01:11:11 -07:00 |
|
silicons
|
9ff94e019b
|
Merge pull request #12924 from SiliconMain/analyzer
Ports long range atmos analyzer from skyrat
|
2020-07-29 01:09:48 -07:00 |
|
Lin
|
447a0b24bf
|
Merge pull request #12944 from timothyteakettle/fixes-crates
fixes some crafted crates containing items
|
2020-07-28 22:11:30 -05:00 |
|
Lin
|
81a7542aa6
|
Merge pull request #12834 from silicons/clickcd_experimental
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
|
2020-07-28 21:51:10 -05:00 |
|
Lin
|
91dc8b96d0
|
Merge pull request #12932 from silicons/ok_2
perfect parries with an energy sword now reflect projectiles back at their shooter
|
2020-07-28 21:45:53 -05:00 |
|
Lin
|
18fa47e479
|
Merge pull request #12931 from Citadel-Station-13/silicons-patch-61
nerfs parrying bullets with a wooden stick following complaints
|
2020-07-28 21:45:36 -05:00 |
|
silicons
|
0152dcda65
|
fix
|
2020-07-28 13:24:45 -07:00 |
|
silicons
|
8313485632
|
fix
|
2020-07-28 11:31:28 -07:00 |
|
silicons
|
6c83beea02
|
Merge pull request #12937 from Ghommie/Ghommie-cit834
Fixing new bugs and stuff.
|
2020-07-28 10:46:17 -07:00 |
|
silicons
|
b0f03eac12
|
ok
|
2020-07-27 21:06:03 -07:00 |
|
silicons
|
2ba01663e5
|
Merge pull request #12945 from timothyteakettle/jar-fixes
bluespace jar / pet carrier logic tweak so it works correctly
|
2020-07-27 19:21:16 -07:00 |
|
timothyteakettle
|
f36071bb64
|
wouldnt it be cool if i tested the small logic change
|
2020-07-28 03:09:07 +01:00 |
|
Timothy Teakettle
|
dc14c02570
|
fix crates
|
2020-07-27 21:55:51 +01:00 |
|
Sishen
|
27aba092e0
|
aaaaaaaaaa
|
2020-07-27 08:20:03 -06:00 |
|
Ghommie
|
f1c242aadc
|
Fixing new bugs and stuff.
|
2020-07-27 14:16:01 +02:00 |
|
silicons
|
850bc0dc33
|
Merge pull request #12919 from SiliconMain/patch-5
Dura belt tweaks
|
2020-07-26 22:58:31 -07:00 |
|
silicons
|
d47b553527
|
Merge pull request #12892 from Literallynotpickles/hi
Reverts extinguishers into being alt-clickable
|
2020-07-26 22:56:22 -07:00 |
|
silicons
|
e240453044
|
Merge pull request #12884 from timothyteakettle/fix-a-bad-bug/exploit
fixes a dumb bug to do with material crafting
|
2020-07-26 22:52:30 -07:00 |
|
silicons
|
b5e21e5555
|
Merge pull request #12896 from timothyteakettle/jar-fixes
makes some small tweaks to pet carriers / bluespace jars
|
2020-07-26 17:21:28 -07:00 |
|
silicons
|
69335bae0e
|
buff
|
2020-07-26 17:20:21 -07:00 |
|
silicons
|
4256826aae
|
epic
|
2020-07-26 17:15:12 -07:00 |
|
silicons
|
0b17c761e7
|
whew
|
2020-07-26 17:11:23 -07:00 |
|
silicons
|
3ab4b62dc1
|
huh
|
2020-07-26 17:03:52 -07:00 |
|