d2f5c6688b
Merge pull request #13084 from Putnam3145/ic-wording-fix
...
Made IC issue wording less salt-assuming
2020-08-09 05:41:10 -07:00
3068accd2b
Merge pull request #13082 from Putnam3145/anaphro
...
Removed (an)aphrodisiacs.
2020-08-09 05:39:56 -07:00
d25daec117
Merge pull request #13081 from Putnam3145/ethereals
...
Ports ethereals from TG
2020-08-09 05:39:43 -07:00
ba6eefc945
Merge pull request #13078 from Putnam3145/fix-reroll
...
Made traitor reroll reroll to MI13 only.
2020-08-09 05:38:23 -07:00
bd65c8efc6
Merge pull request #13079 from Hatterhat/parry-text
...
parry counterattack text now actually shows up
2020-08-09 05:37:42 -07:00
3acd4ac6de
Merge pull request #13069 from Chiirno/radioactive-port
...
Ports TG #51879 - Makes rads glow, buffs rad goggles
2020-08-09 05:35:08 -07:00
bdee7bdc63
linters are always your friend
2020-08-08 21:38:53 -07:00
13d94717f4
Merge pull request #13052 from Citadel-Station-13/silicons-patch-76
...
fixes laptops not being able to be picked up
2020-08-08 12:05:36 -05:00
f154623284
Merge pull request #13059 from Citadel-Station-13/silicons-patch-81
...
immovable rods no longer drop down chasms
2020-08-08 12:02:47 -05:00
02c990ab27
Toggle's no longer relevant.
2020-08-08 02:18:58 -07:00
9dcfceb8e9
Made IC issue wording less assuming-salt
2020-08-08 01:32:18 -07:00
467f66b2a6
Removed crocin/hexacrocin.
2020-08-08 00:46:30 -07:00
9bb3ba5c5a
added ethereals
2020-08-08 00:08:43 -07:00
8ade386190
fucks around with parry text
2020-08-08 00:12:51 -05:00
5d62e2af23
Made reroll reroll to objectives only.
2020-08-07 21:51:37 -07:00
795a1fab35
Merge pull request #13048 from Hatterhat/glaive-parry
...
Proto-Kinetic Glaives Phase 2 - Parrying
2020-08-07 17:29:57 -07:00
fd8f3781cc
test commit please ignore
2020-08-07 17:03:38 -05:00
c227fc7546
wait, shit
2020-08-07 16:56:53 -05:00
14e35806b9
I hope this works
2020-08-07 16:23:15 -03:00
e1e9b77b07
Update immovable_rod.dm
2020-08-07 00:36:04 -07:00
aa5b99a9d4
make it end
2020-08-07 00:03:59 -07:00
4dd51f3d9c
fix
2020-08-06 23:48:05 -07:00
72d0f2a4a3
AAAAAAAA
2020-08-06 23:43:14 -07:00
65839060c9
Fixes
2020-08-06 23:39:57 -07:00
3640a33ff6
e
2020-08-06 23:22:53 -07:00
bcfc601c7a
sigh
2020-08-06 23:11:09 -07:00
8edb374a20
sigh
2020-08-06 23:09:02 -07:00
1586625e6b
Merge pull request #12960 from timothyteakettle/loadout-you-say
...
loadout changes part 1: adds subcategories to the loadout
2020-08-06 21:59:13 -07:00
e773062b9a
reverse the loadout update
2020-08-07 03:58:19 +01:00
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
009f0ebeeb
Merge pull request #13013 from DeltaFire15/newnew-clock-misc-stuff
...
N tvsg sebz Nezbere (or: a bunch of clockcult related stuff)
2020-08-06 19:37:30 -07:00
add3be1654
Merge pull request #13038 from Sishen1542/blorble
...
adds *blorble and *blurp as carbon emotes
2020-08-06 19:36:38 -07:00
60b93386a1
Merge pull request #13043 from Sishen1542/boneless
...
🅱️ oneless
2020-08-06 19:35:56 -07:00
e9cbb550a1
Update laptop.dm
2020-08-06 18:09:50 -07:00
c07495d940
Merge branch 'master' into ok-listen-its-an-accident
2020-08-06 18:39:51 +01:00
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
ea97e98b5c
Update _vending.dm ( #13035 )
2020-08-06 18:04:03 +02:00
4fa23feb04
🅱️ oneless
2020-08-05 19:16:10 -06: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
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
8442d69858
Merge pull request #12963 from Seris02/morefix
...
ghost chilis fixed
2020-08-05 15:44:48 -07:00
9b02b6619d
Update code/modules/hydroponics/grown/chili.dm
...
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com >
2020-08-06 06:44:17 +08:00
57be216251
Merge pull request #12995 from timothyteakettle/travelling-traders
...
a few small tweaks to travelling traders
2020-08-05 15:28:15 -07:00
2001c589c4
fuck
2020-08-05 23:28:13 +01:00
4cc3ca2193
lets try that again
2020-08-05 23:27:47 +01:00
ed5aa7c9f7
Merge pull request #12994 from kappa-sama/patch-37
...
removes dildo
2020-08-05 15:27:29 -07:00
bb8dfa9236
Merge pull request #12991 from b1tt3r1n0/I'mAlreadyTracer
...
I wanna be tracer
2020-08-05 15:26:37 -07:00
silicons