silicons
9c63a09907
Merge branch 'pr-13087'
2020-08-16 18:40:07 -07:00
silicons
01dd2f389b
Merge branch 'pr-13067'
2020-08-16 18:38:13 -07:00
Lin
d287f44d9a
Merge pull request #13045 from silicons/coggers
...
ports bronze (fake clockwork) airlocks and windows
2020-08-16 20:20:03 -05:00
Hatterhat
bc0ca30647
there is no cooldown, press G
2020-08-16 15:45:11 -05:00
Navier
fc70d3dde2
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into DRAKEBORG
2020-08-15 23:13:41 -04:00
silicons
b2c65e34fc
Merge pull request #13157 from kiwedespars/nullrod-nerf
...
chaplain nullrod nerf
2020-08-15 08:00:43 -07:00
kiwedespars
61486f1287
adds custom parry data.
2020-08-14 01:59:46 -07:00
kiwedespars
53be29d9c2
Update dualsaber.dm
2020-08-14 01:43:47 -07:00
Hatterhat
d5b788a655
shortparry window restored, glaive parry req wield
2020-08-12 23:33:59 -05:00
silicons
82824f9fb9
Merge pull request #13100 from lolzalolka/lean2
...
Suture/Mesh Crafting (take2)
2020-08-11 01:40:50 -07:00
Letter N
ab7c560f6d
revert
2020-08-11 16:04:18 +08:00
silicons
5814eba033
Merge pull request #13103 from Hatterhat/oops-all-parries
...
funny timestop katana is less funny and more gameplay oriented
2020-08-10 23:30:30 -07:00
Hatterhat
f4f8812318
whitespace (tm)
2020-08-10 11:30:36 -05:00
Hatterhat
4610908b8e
Merge branch 'master' into parries-but-dumber
2020-08-10 11:29:27 -05:00
silicons
05290c85f3
Merge pull request #13094 from Hatterhat/tc-theft-patch
...
PDA Uplinks Can Now Siphon Pens
2020-08-10 02:30:11 -07:00
silicons
ef2c024fbe
Merge pull request #13093 from kappa-sama/patch-41
...
Tracer's a human, not a changeling.
2020-08-10 02:29:58 -07:00
Hatterhat
301adc6769
ung
2020-08-09 23:58:12 -05:00
Hatterhat
ff49790ac9
radius/force/blockchance nerf
2020-08-09 21:27:57 -05:00
chrisbbbbbbb
758d540c9e
Suture/Mesh Crafting
2020-08-09 20:33:40 +02:00
silicons
f20f01cc6b
Merge pull request #12853 from LetterN/TGUI-4
...
TGUI4 port
2020-08-09 05:46:21 -07:00
silicons
fb43e9a2d2
Merge pull request #13054 from KeRSedChaplain/zombies!
...
Improves zombies, the gimped threat
2020-08-09 05:42:31 -07:00
silicons
25d7b15478
Merge pull request #13060 from Hatterhat/timestop-katana
...
wizard timestop parrying katana
2020-08-09 05:41:55 -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
Letter N
f1c4a7f6ac
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-08-09 14:54:16 +08:00
Hatterhat
197e426432
heho funny uplink thefties
2020-08-08 23:54:31 -05:00
kappa-sama
8c61dd875b
poggers
2020-08-08 21:30:42 -04:00
Hatterhat
a496588171
bokken cooldown nerf but slightly
2020-08-08 14:31:45 -05:00
Hatterhat
c7e850ae19
longparry stagger reduced, cooldown made universal
2020-08-08 14:14:47 -05:00
Hatterhat
98d305e5f6
bokken nerfs, desword deflects
2020-08-08 14:11:47 -05: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
Hatterhat
6f754188ac
funny guns go pew
2020-08-07 18:02:33 -05:00
Hatterhat
029d88ac9d
play a real shin megami tensei game
2020-08-07 03:32:54 -05:00
Hatterhat
32a1c90b67
what are we in for
2020-08-07 03:25:05 -05:00
Hatterhat
965efe6dab
funny timestop katana adminbus only
2020-08-07 03:13:43 -05:00
Letter N
cc98f50eb6
what if slabs still show things even if ratvar is free? Does not fix "the sleeper" though
2020-08-07 11:25:36 +08:00
Dan-Neposh
9e62c7b7c3
Improves zombies, the gimped threat
...
Makes zombies take no stamina damage due to being a reanimated corpse, makes zombies not enter softcrit (but still hardcrit for the fake death thing), gives the romerol kit a guide on proper usage of the chem.
2020-08-06 22:43:15 -04: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
Letter N
333ca2cc7b
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-08-06 18:26:04 +08:00
silicons
2a0f2a38a7
Fix
2020-08-05 21:42:05 -07:00
silicons
815ddd1866
oh boy
2020-08-05 21:34:26 -07: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
Letter N
f2f6416105
fixes - radio, broken - crewmanifest, gastank controler
2020-08-05 20:34:09 +08:00
silicons
3e2ab66afa
Update shields.dm
2020-08-04 21:34:59 -07:00
Letter N
ed67801590
what if the tgui actualy recives it's topic?
2020-08-05 09:21:19 +08:00
