Commit Graph
5929 Commits
Author SHA1 Message Date
necromanceranne 6ebc911937 Batons knockdown and slowdown on rightclick, otherwise they stagger, but always do damage. Damage respects melee armor, but power cells grant armor pen based on max charge. 2021-03-16 04:48:55 +11:00
siliconsandGitHub 5472186bc2 Merge pull request #14398 from LetterN/post-hardsync1.5
post-hardsync1.5
2021-03-14 23:30:26 -06:00
kiwedespars 69d927e756 Merge branch 'master' into void-but-for-real 2021-03-12 23:10:19 -08:00
YakumoChenandGitHub 8484f2f120 adds ancient kit 2021-03-13 03:36:54 +00:00
Letter N 935e46b492 The Mapping Update
Cleans up the map (again)
Makes mining code more better
2021-03-12 12:11:35 +08:00
kiwedespars 5ce42584b2 void tp effect, sound changes 2021-03-10 21:16:08 -08:00
LinandGitHub 521570793f Merge pull request #14392 from R3dtail/patch-4
Readability/Grammar alteration
2021-03-10 18:34:47 -06:00
Hatterhat d473b271cb uh oh! it's another stupid fucking hatter pr! 2021-03-10 15:06:39 -06:00
siliconsandGitHub 18fdd0c6cf Merge pull request #14337 from kiwedespars/we-hate-cqc
nerfs cqc (probably)
2021-03-10 01:32:14 -07:00
Letter N 59a725c25a icon(s) fixes and fixes boards 2021-03-10 11:26:33 +08:00
R3dtailandGitHub 25651e9144 Readability/Grammar alteration 2021-03-09 14:38:24 -06:00
kiwedespars 3b92e33112 Merge branch 'master' into void-but-for-real 2021-03-09 12:29:50 -08:00
kiwedespars 3ce6459aef void heretic and many other prs 2021-03-09 02:58:34 -08:00
siliconsandGitHub 58b69786c8 Merge pull request #14358 from Hatterhat/femur-breakies
femur breaker actually breaks legs any%
2021-03-09 00:18:41 -07:00
Letter N 22b33d1a6e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-07 13:04:36 +08:00
siliconsandGitHub 21905f45f3 Merge pull request #14353 from dzahlus/small-big-iron-on-his-hip-in-his-pocket
MWS-01 Changes
2021-03-06 16:59:46 -07:00
Letter N e84257e624 fix surgery cb, linter 2021-03-06 11:22:01 +08:00
DeltaFireandGitHub 357853863e Merge pull request #14352 from timothyteakettle/jar-nerf
exiting a bluespace jar through any means, hardstuns you for 5 seconds
2021-03-06 03:50:35 +01:00
Letter N c624c3ae14 economical inflation 2021-03-05 20:00:45 +08:00
Letter N 34697acf74 missing icon fix & stop throwing out parts 2021-03-05 19:29:52 +08:00
Letter N cb346a3847 a 2021-03-05 14:29:36 +08:00
Putnam3145andGitHub 43d66e90b7 Merge pull request #14356 from keronshb/RPlasmaTweak
Removes Superconuctivity from Reinforced Plasma Glass
2021-03-04 09:33:45 -08:00
Letter N 45278c02a2 send it 2021-03-04 16:41:42 +08:00
Letter N 7e427aa8e6 HOTFIX AEIOU 2021-03-04 16:20:44 +08:00
Letter N 754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
Hatterhat 9b2d62b9ef whoops again 2021-03-02 22:09:38 -06:00
Hatterhat dc5ca7a556 oops 2021-03-02 22:07:13 -06:00
Hatterhat 053f9ea857 any% 2021-03-02 22:06:57 -06:00
keronshb b105556603 No Superconductivity with Reinforced Plasma Glass
Removes heat going through RPlasma Glass
2021-03-02 21:45:36 -05:00
siliconsandGitHub 824f346763 Merge pull request #14344 from qweq12yt/pacifist-flamethrower-fix
[FIX] More pacifism bug squashing
2021-03-02 16:57:26 -07:00
timothyteakettle f0d219e999 Update pet_carrier.dm 2021-03-02 14:26:53 +00:00
timothyteakettle a5c17eead4 Update pet_carrier.dm 2021-03-02 14:25:44 +00:00
dzahlus f0a34723d7 tase lase 2021-03-01 23:58:29 +01:00
qweq12yt d3aeb714f1 flamethrowers now can't be used by pacifists 2021-02-28 20:21:19 -03:00
kiwedespars 081b669345 Merge branch 'master' into we-hate-cqc 2021-02-27 22:19:16 -08:00
Putnam 50c1a83c6a Adds a pAI policy config 2021-02-26 00:34:13 -08:00
siliconsandGitHub 504a36f50d Update holy_weapons.dm 2021-02-24 01:36:03 -07:00
SandPoot 6c5acc3b4d upload files 2021-02-23 16:42:07 -03:00
Letter N 5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
siliconsandGitHub 178fe9cf55 Merge pull request #14253 from keronshb/eutactic_blade_restoration
Hyperblade restored to uplink
2021-02-22 13:10:21 -07:00
Timothy Teakettle 5c2f5cf8a7 Update charter.dm 2021-02-22 17:07:10 +00:00
siliconsandGitHub 841bb2aac2 Merge pull request #14265 from SandPoot/tool_behavior-replacing
Tool behavior replacing
2021-02-21 14:48:50 -07:00
kiwedespars de69e9996a nerfs cqc 2021-02-21 13:10:08 -08:00
Timothy Teakettle b2015e4c94 blacklist 2021-02-21 17:32:07 +00:00
Letter N 7c0a63f729 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-21 09:57:22 +08:00
timothyteakettle deb1a5374d Update ghost_role_spawners.dm 2021-02-20 00:33:57 +00:00
timothyteakettle d34c821db4 Update ghost_role_spawners.dm 2021-02-19 23:45:01 +00:00
Timothy Teakettle a444918936 Update ghost_role_spawners.dm 2021-02-19 23:11:41 +00:00
LinandGitHub dbcc95ea28 Merge pull request #14262 from timothyteakettle/lawyer-message-all-href
stops people using Message All on PDAs when their cartridge doesn't allow it
2021-02-18 23:34:11 -06:00
Letter N 037378eb7d Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-19 10:34:47 +08:00