ad77a6120a
Merge pull request #13033 from Citadel-Station-13/silicons-patch-72
...
how about we not gib slimepeople for having too much blood that is a little unfun eh now they'll just take damage and bleed the excess
2020-08-06 12:31:43 -05:00
dafe9b6a38
Merge pull request #13029 from silicons/textwallers
...
attempting to send an emote above 2048 characters will now reflect it back to you without sending instead of rudely cutting off your emote mid-message.
2020-08-06 12:31:25 -05:00
32805fc7c2
Merge pull request #12996 from silicons/typing_indicators_fix
...
fixes typing indicators being stuck (maybe) by using mutable appearances instead of iconstates.
2020-08-05 20:02:29 -05:00
0ff5c90fc8
Merge pull request #12969 from silicons/e
...
someone asked i code holoparasites playing music so here we are???
2020-08-05 19:48:37 -05:00
ede59e5c4d
Merge pull request #13021 from silicons/salt_pr
...
gives ipcs silicon sound emotes
2020-08-05 19:43:54 -05:00
b2052a16cb
Merge pull request #13008 from zeroisthebiggay/powercreepislife
...
nukies can buy holoparasites not including support ones
2020-08-05 15:13:13 -07:00
810962c633
Update blood.dm
2020-08-05 01:29:51 -07:00
c0ac492d07
ok
2020-08-04 21:01:06 -07:00
d79cc5f85d
oof
2020-08-04 20:57:37 -07:00
0a137d2584
whew
2020-08-04 20:52:35 -07:00
bbcc36bdec
ok
2020-08-03 22:31:31 -07:00
a4132c04ea
Merge pull request #12894 from timothyteakettle/wounds-part-2
...
port of wounds part 2
2020-08-03 14:43:07 -07:00
db8abc006a
Merge pull request #13010 from Seris02/fixeslizards
...
lizards no longer break their spines ~~roundstart~~ EVER AGAIN I FUCKING FIXED THE DOUBLE SET_SPECIES LIZARD BUG
2020-08-03 12:54:00 -07:00
82790cffed
fixes lizard code
2020-08-03 21:39:11 +08:00
d5a19ea4b2
Merge pull request #13004 from zeroisthebiggay/tailwagfuckyou
...
prefs for headpat wagging
2020-08-03 02:30:57 -07:00
aeec3a3404
lizards no longer have broken spines
2020-08-03 17:29:32 +08:00
d3cfa47d65
a
2020-08-02 22:27:42 -04:00
2d4127a9a7
a
2020-08-02 22:26:45 -04:00
35c5c2f4cd
a
2020-08-02 22:17:44 -04:00
2885b861f2
Merge pull request #12954 from silicons/killer_queen
...
bomb stands now use components
2020-08-02 12:52:07 -05:00
289c186f32
Merge remote-tracking branch 'upstream/master' into wounds-part-2
2020-08-02 18:11:07 +01:00
03d01d917f
Merge branch 'master' into wounds-part-2
2020-08-02 18:10:31 +01:00
06f5ce6401
buffs shoving ( #12925 )
...
* ^w^
* ok
* ok
2020-08-02 18:30:09 +02:00
aa782f1105
a
2020-08-02 02:27:24 -04:00
34a8d8f798
a
2020-08-02 01:38:23 -04:00
25d1fb761a
Merge remote-tracking branch 'citadel/master' into killer_queen
2020-08-01 20:51:38 -07:00
3fa35e4fa6
fix
2020-08-01 20:49:31 -07:00
2230a3665a
Merge pull request #12965 from timothyteakettle/end-our-suffering
...
drastically lowers the damage-related benefits of combat mode
2020-08-01 03:33:43 -07:00
d1edbab264
Update life.dm
2020-07-31 14:39:40 -07:00
16fb4b3291
Merge pull request #12964 from timothyteakettle/monkeys-bleed-a-lot
...
monkeys stop bleeding nonstop
2020-07-31 14:21:57 -05:00
3a773809b6
Update guardian.dm
2020-07-31 00:22:46 -07:00
b8522a2ae0
ok
2020-07-29 20:04:47 -07:00
caaedce6e2
end our suffering
2020-07-30 02:33:39 +01:00
55be55ce0f
Revert "end our suffering"
...
This reverts commit 4e1fcc4e08
2020-07-30 02:29:13 +01:00
4e1fcc4e08
end our suffering
2020-07-30 02:28:53 +01:00
940fe8240d
monkey blood fix
2020-07-30 01:57:09 +01:00
c60e595d99
Merge pull request #12955 from Arturlang/bloodsucker_life
...
Plugs bloodsucker LifeTick into BiologicalLife
2020-07-29 14:02:22 -07:00
9721025582
Merge branch 'master' into wounds-part-2
2020-07-29 15:47:44 +01:00
78312c23bf
sigh
2020-07-28 21:53:07 -07:00
a5dd08a054
Merge pull request #12734 from silicons/shoelaces
...
shoelaces. untying people's shoelaces. admin smite to untie someone's shoelaces. credit to shaps/tg.
2020-07-28 21:51:43 -05:00
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
ae02a7348c
Merge pull request #12929 from Citadel-Station-13/silicons-patch-59
...
silicons (and all other nonhuman mobs) can now block (with the right items)
2020-07-28 21:48:14 -05:00
e8ab87c396
Merge pull request #12928 from Citadel-Station-13/silicons-patch-58
...
silicons (and any other nonhuman mob) can now parry
2020-07-28 21:48:03 -05:00
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
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
e0d9c7972d
Makes it actually work
2020-07-29 01:50:40 +03:00
ab67ae3291
Merge pull request #12951 from timothyteakettle/haha-yes-blood
...
bloodsucker blood loss fix
2020-07-28 13:26:07 -07:00
09f2594c37
Plugs bloodsucker LifeTick into BiologicalLife
2020-07-28 22:58:13 +03:00
c87c2bd850
smh
2020-07-28 12:31:35 -07:00
78b6a60e80
oh
2020-07-28 12:25:27 -07:00
Lin