Commit Graph

5099 Commits

Author SHA1 Message Date
silicons
4da1d0b73c Update human_defense.dm (#13002) 2020-08-09 16:06:53 +02:00
Seris02
635a42e102 yeet (#11699) 2020-08-09 15:14:25 +02:00
silicons
a950adc0df Update regalrat.dm (#13076) 2020-08-09 14:49:10 +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
Letter N
773509719a TGUI-Go for launch 2020-08-09 20:39:04 +08:00
Letter N
f1c4a7f6ac Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-09 14:54:16 +08:00
Putnam
bdee7bdc63 linters are always your friend 2020-08-08 21:38:53 -07:00
Putnam
9bb3ba5c5a added ethereals 2020-08-08 00:08:43 -07:00
Hatterhat
8ade386190 fucks around with parry text 2020-08-08 00:12:51 -05:00
Hatterhat
029d88ac9d play a real shin megami tensei game 2020-08-07 03:32:54 -05: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
add3be1654 Merge pull request #13038 from Sishen1542/blorble
adds *blorble and *blurp as carbon emotes
2020-08-06 19:36:38 -07:00
silicons
60b93386a1 Merge pull request #13043 from Sishen1542/boneless
🅱️oneless
2020-08-06 19:35:56 -07:00
Timothy Teakettle
c07495d940 Merge branch 'master' into ok-listen-its-an-accident 2020-08-06 18:39:51 +01:00
Lin
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
Lin
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
Letter N
333ca2cc7b Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-06 18:26:04 +08:00
Sishen
4fa23feb04 🅱️ oneless 2020-08-05 19:16:10 -06:00
Lin
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
Lin
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
Lin
ede59e5c4d Merge pull request #13021 from silicons/salt_pr
gives ipcs silicon sound emotes
2020-08-05 19:43:54 -05:00
silicons
b2052a16cb Merge pull request #13008 from zeroisthebiggay/powercreepislife
nukies can buy holoparasites not including support ones
2020-08-05 15:13:13 -07:00
Timothy Teakettle
4429c4615b no gibbies please 2020-08-05 22:58:15 +01:00
Sishen
92be50c252 blorbl 2020-08-05 09:28:34 -06:00
silicons
810962c633 Update blood.dm 2020-08-05 01:29:51 -07:00
silicons
c0ac492d07 ok 2020-08-04 21:01:06 -07:00
silicons
d79cc5f85d oof 2020-08-04 20:57:37 -07:00
silicons
0a137d2584 whew 2020-08-04 20:52:35 -07:00
silicons
bbcc36bdec ok 2020-08-03 22:31:31 -07:00
Letter N
454baea55f Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-04 09:31:34 +08:00
silicons
a4132c04ea Merge pull request #12894 from timothyteakettle/wounds-part-2
port of wounds part 2
2020-08-03 14:43:07 -07:00
silicons
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
Seris02
82790cffed fixes lizard code 2020-08-03 21:39:11 +08:00
Letter N
b30607b759 ayys update - ordering shit 2020-08-03 21:37:11 +08:00
Letter N
9a9e3ffef5 fixfixfix squared. Will not fix missing clockslab tabs, you just have to give it a category. 2020-08-03 21:14:17 +08:00
silicons
d5a19ea4b2 Merge pull request #13004 from zeroisthebiggay/tailwagfuckyou
prefs for headpat wagging
2020-08-03 02:30:57 -07:00
Seris02
aeec3a3404 lizards no longer have broken spines 2020-08-03 17:29:32 +08:00
zerothebigboy
d3cfa47d65 a 2020-08-02 22:27:42 -04:00
zerothebigboy
2d4127a9a7 a 2020-08-02 22:26:45 -04:00
zerothebigboy
35c5c2f4cd a 2020-08-02 22:17:44 -04:00
Lin
2885b861f2 Merge pull request #12954 from silicons/killer_queen
bomb stands now use components
2020-08-02 12:52:07 -05:00
Timothy Teakettle
289c186f32 Merge remote-tracking branch 'upstream/master' into wounds-part-2 2020-08-02 18:11:07 +01:00
Timothy Teakettle
03d01d917f Merge branch 'master' into wounds-part-2 2020-08-02 18:10:31 +01:00
silicons
06f5ce6401 buffs shoving (#12925)
* ^w^

* ok

* ok
2020-08-02 18:30:09 +02:00
zerothebigboy
aa782f1105 a 2020-08-02 02:27:24 -04:00
zerothebigboy
34a8d8f798 a 2020-08-02 01:38:23 -04:00
silicons
25d1fb761a Merge remote-tracking branch 'citadel/master' into killer_queen 2020-08-01 20:51:38 -07:00