Timothy Teakettle
|
dad0aa72f0
|
OH BOY
|
2022-06-02 19:18:11 +01:00 |
|
deathride58
|
20eb61b319
|
makes slimes specifically have overlay-blended blood!
|
2022-05-26 22:56:10 -04:00 |
|
deathride58
|
a37c3a8721
|
multiplicative blood - makes the majority of blood visuals use multiplicative blending
|
2022-05-25 03:25:20 -04:00 |
|
SandPoot
|
695835fcd6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)
|
2022-04-09 00:03:13 -03:00 |
|
SandPoot
|
586a035132
|
Update files
|
2022-04-06 18:41:31 -03:00 |
|
SandPoot
|
189716314f
|
Would you like some defines in these trying times?
|
2022-03-23 12:10:02 -03:00 |
|
silicons
|
2323bd31cd
|
Merge pull request #15522 from bunny232/wintercoats
Insulation works both ways you know.
|
2022-02-26 18:08:59 -07:00 |
|
SandPoot
|
5029af901b
|
Upload files
|
2022-02-25 16:58:09 -03:00 |
|
evan
|
7f9d7936f0
|
a
|
2022-02-21 18:31:48 -05:00 |
|
evan
|
2619387dc1
|
woops
|
2022-02-21 18:25:12 -05:00 |
|
evan
|
4d403ebca5
|
Update miscellaneous.dm
|
2022-02-21 18:14:56 -05:00 |
|
keronshb
|
f1ca283318
|
Merge branch 'master' into familyport
|
2022-02-11 14:04:57 -05:00 |
|
keronshb
|
af83fb9611
|
FestiveMap 2021
|
2021-11-20 12:04:35 -05:00 |
|
keronshb
|
6b23d177c8
|
Merge remote-tracking branch 'upstream/master'
|
2021-10-15 19:25:41 -04:00 |
|
keronshb
|
0bae06adcd
|
Original Port
|
2021-10-11 22:00:54 -04:00 |
|
SandPoot
|
f77ff24a6f
|
Update tacklers.dm
|
2021-10-07 12:59:25 -03:00 |
|
WanderingFox95
|
e5e8faec30
|
Applying suggestions from the review
Co-authored-by: Arturlang <24881678+Arturlang@users.noreply.github.com>
|
2021-07-21 19:46:18 +02:00 |
|
WanderingFox95
|
cdc6fe1cd4
|
Goliath Gloves
|
2021-07-20 18:50:47 +02:00 |
|
silicons
|
c1928c9446
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-06-16 19:04:16 -07:00 |
|
Vynzill
|
df72710cae
|
herewego
|
2021-06-14 17:19:05 -05:00 |
|
silicons
|
1a800cc470
|
modifications
|
2021-06-07 19:40:16 -07:00 |
|
zeroisthebiggay
|
bdd7ae54d4
|
Update miscellaneous.dm
|
2021-05-24 23:10:07 -04:00 |
|
zerothebigboy
|
fc3c898cd4
|
tab
|
2021-05-24 21:49:36 -04:00 |
|
zerothebigboy
|
36fe3fef76
|
abuse
|
2021-05-24 21:40:15 -04:00 |
|
zerothebigboy
|
bc61ada440
|
KILL
|
2021-05-19 13:24:40 -04:00 |
|
zerothebigboy
|
af4823e83c
|
KILL
|
2021-05-19 09:19:49 -04:00 |
|
zerothebigboy
|
e22bdc3fb5
|
KILL
|
2021-05-18 18:56:28 -04:00 |
|
zerothebigboy
|
fff719c408
|
KILL
|
2021-05-18 18:47:12 -04:00 |
|
silicons
|
9e6fb3a310
|
Merge pull request #14281 from kiwedespars/undo-what-has-been-done
parrying nerf/pugilism buff
|
2021-02-26 13:36:09 -07:00 |
|
kiwedespars
|
15a8d1d5e0
|
i did a thing
- reverted salt nerf
- made it so you can't parry while resting
|
2021-02-20 17:24:30 -08:00 |
|
SandPoot
|
123de14009
|
upload files
|
2021-02-18 15:05:39 -03:00 |
|
SandPoot
|
f738023097
|
Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
|
2021-02-18 15:04:46 -03:00 |
|
SandPoot
|
cf2e70671a
|
upload files
|
2021-02-18 14:47:10 -03:00 |
|
DeltaFire
|
06101ee9c8
|
sigh
|
2021-02-12 03:30:15 +01:00 |
|
Lin
|
fe263ae2ff
|
Merge pull request #13890 from silicons/parry
ablative parry armwraps
|
2021-02-05 23:52:18 -06:00 |
|
silicons
|
9ddb3dc5d9
|
fix
|
2021-01-13 16:22:43 -07:00 |
|
silicons
|
1dfe6d3685
|
Update miscellaneous.dm
|
2020-12-28 12:59:05 -07:00 |
|
silicons
|
8d981bfa82
|
high cooldown on failure
|
2020-12-27 12:05:32 -08:00 |
|
silicons
|
4da7a3867c
|
fix
|
2020-12-27 10:22:27 -08:00 |
|
silicons
|
53253bfce1
|
changes
|
2020-12-27 10:13:09 -08:00 |
|
Hatterhat
|
aa7c871b59
|
yea
|
2020-12-24 18:15:04 -06:00 |
|
silicons
|
803bff4e5f
|
funny
|
2020-11-12 23:34:42 -07:00 |
|
Hatterhat
|
0db189333a
|
>one fucking callback
|
2020-08-30 21:21:27 -05:00 |
|
Hatterhat
|
7ed2a3cbfe
|
update
|
2020-08-28 20:28:05 -05:00 |
|
silicons
|
82d8b7266f
|
Merge pull request #13238 from Hatterhat/insidious-tackle
insidious combat gloves but they can tackle now
|
2020-08-23 17:36:03 -07:00 |
|
silicons
|
7f942abef2
|
Merge pull request #13239 from zeroisthebiggay/fetishglovesbelike
zero adds black fetish gloves because hes Horny
|
2020-08-23 05:08:14 -07:00 |
|
zerothebigboy
|
21836b4ec8
|
: )
|
2020-08-22 18:11:03 -04:00 |
|
Hatterhat
|
8645a2954f
|
tackle hando
|
2020-08-22 16:13:41 -05:00 |
|
Hatterhat
|
02194633b5
|
initial commit - za hando
|
2020-08-20 09:14:30 -05:00 |
|
lolman360
|
c9de596fde
|
Verified!
|
2020-08-09 15:31:49 +10:00 |
|