silicons
07b28f40de
Merge pull request #13359 from Ghommie/Ghommie-cit838
...
Turf visuals fix plus corrected names of a couple things.
2020-09-07 13:42:05 -07:00
Ghommie
16e0292270
fixed.
2020-09-06 20:41:35 +02:00
Ghommie
71aa5b9642
Emergent runtime issue.
2020-09-06 20:40:24 +02:00
Ghommie
4a04b22b72
Turf visuals fix plus corrected names of a couple things.
2020-09-06 18:53:01 +02:00
Putnam3145
d6127d71a8
Merge pull request #13352 from timothyteakettle/fix-accents-but-pushed-this-time
...
lets ipcs talk but i actually push my changes this time
2020-09-05 08:40:31 -07:00
Timothy Teakettle
f9bb245acc
DONT MAKE THE SAME MISTAKE
2020-09-05 16:32:41 +01:00
Timothy Teakettle
93501e2d3d
sorry ipcs
2020-09-05 16:24:58 +01:00
silicons
7b50b22c7b
Merge pull request #13244 from lolman360/AnPrimAssistants
...
Blacksmithing 2: Anarcho-Primitivist Assistants (travis don't fail on me now)
2020-09-05 02:20:11 -07:00
silicons
e110945568
Merge pull request #13289 from kiwedespars/heretics-touchup
...
heretics touchup
2020-09-05 02:15:21 -07:00
Putnam3145
bce53f71ce
Merge pull request #13322 from timothyteakettle/fix-accents
...
makes handle_speech in ipc accent actually return the speech args so ipcs can talk
2020-09-02 17:56:40 -07:00
Ghommie
a455092c1f
aaaa
2020-09-02 19:27:04 +02:00
Ghommie
dc9b024fae
Blemishes begone.
2020-09-02 19:16:16 +02:00
lolman360
5697ab2ff4
Merge remote-tracking branch 'upstream/master' into AnPrimAssistants
2020-09-01 16:57:02 +10:00
silicons
77cf561f7f
Merge pull request #13316 from timothyteakettle/ckey-pref
...
pref for hiding your ckey from roundend report
2020-08-31 21:19:37 -07:00
lolman360
05bd0579ca
Merge remote-tracking branch 'upstream/master' into AnPrimAssistants
2020-09-01 11:23:57 +10:00
timothyteakettle
a9ec2254ba
hide your ckey
2020-08-31 01:47:49 +01:00
Timothy Teakettle
34393a187b
fix ipcs
2020-08-30 16:27:09 +01:00
silicons
4a3b6054d3
Merge pull request #13266 from Ghommie/Ghommie-cit836
...
Fixing some mistakes with the priority overlays removal PR.
2020-08-29 21:22:44 -07:00
silicons
84734591ed
Merge pull request #13268 from timothyteakettle/accents
...
separates tongues speech handling into accent datums
2020-08-29 21:22:11 -07:00
silicons
7ad037ee53
Merge pull request #13276 from timothyteakettle/emotes
...
every emote is unrestricted
2020-08-29 21:21:01 -07:00
silicons
e677804bd7
Merge pull request #13277 from Chiirno/AnaPanRework
...
Reworks Anatomic Panacea
2020-08-29 21:19:47 -07:00
Letter N
ae482c1bb8
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
2020-08-29 14:09:56 +08:00
kiwedespars
a7d68281a3
new changes
...
- runes can now be destroyed by non-heretics using a bible or a null rod
- mansus grasp now has a unique inhand color.
- madness grasp now has a unique inhand color.
- blood siphon is now redder.
- silence spell, lasts 20 seconds, gives an obvious message to the victim.
- fire immunity passive for ash
- guaranteed dislocation passive for flesh
- rust grasp passive for disgusting mood/vomiting
- rust grasp cooldown reduced by 75% on hit
- living heart now checks z-level when telling you where someone is.
- grasp of decay: forced corrosion for 20 seconds, can make you vomit. probably shitcode.
- madness touch: give people trauma, braindamage and a terrible mood.
- nightwatcher's rite: fire shotgun that can do 75 damage on point blank
- flesh sickle buffed a bit.
- descriptions touched up a bit.
2020-08-28 16:42:25 -07:00
raspy-on-osu
4f2f6b537e
credit's already given in the pr let's not
2020-08-28 13:44:41 -04:00
raspy-on-osu
96d006f551
oops
2020-08-27 23:48:19 -04:00
raspy-on-osu
ca34a50726
Port "Better Explosion Echoes" by NotRanged https://github.com/Skyrat-SS13/Skyrat13/pull/3295
2020-08-27 23:39:43 -04:00
Timothy Teakettle
b3c459c59c
okay you can use any emote
2020-08-27 21:04:36 +01:00
Lynxless
4caeb310f7
Added blank line to the end of files
2020-08-27 15:59:07 -03:00
Lynxless
828a65a7fd
New branch test
2020-08-27 15:46:40 -03:00
timothyteakettle
8d6a026153
yep
2020-08-27 00:01:54 +01:00
timothyteakettle
97564312e3
mindreaders know your move
2020-08-26 17:06:58 +01:00
Ghommie
2811f744e3
Fixing some mistakes with the priority overlays removal PR.
2020-08-26 14:00:35 +02:00
lolman360
6b096d80cc
eee o aaa
2020-08-25 18:55:57 +10:00
lolman360
f2a7c2599d
Merge remote-tracking branch 'upstream/master' into AnPrimAssistants
2020-08-24 09:36:36 +10:00
lolman360
bd5848a0e3
Update recipes_misc.dm
2020-08-24 08:52:42 +10:00
silicons
4d7d068407
Update airlock.dm ( #13182 )
2020-08-23 21:01:26 +02:00
lolman360
289280f0ec
Update recipes_misc.dm
2020-08-24 00:00:39 +10:00
lolman360
bc14155632
Merge remote-tracking branch 'upstream/master' into AnPrimAssistants
2020-08-23 17:01:45 +10:00
lolman360
1deafc7103
its asking me to commit hold on
2020-08-23 17:01:32 +10:00
lolman360
2a3ada511e
It's all codersprites?
...
Always has been.
2020-08-23 16:51:55 +10:00
silicons
c7c74e7c51
Merge pull request #13213 from lolman360/breath
...
breath mask balaclava
2020-08-22 15:22:04 -07:00
silicons
876dc36dbc
Merge pull request #13201 from kiwedespars/return-the-punch
...
makes it so you can craft armwraps roundstart again.
2020-08-22 15:21:22 -07:00
silicons
7737e76b32
Merge pull request #13224 from Ghommie/Ghommie-cit835
...
Removing priority overlays, update_icon() splitup for guns.
2020-08-22 15:19:07 -07:00
Letter N
317480a3e7
something something skin texture revert. oh and oh fuck shit passkeys works again.
2020-08-22 15:07:02 +08:00
Letter N
afe32406c0
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
2020-08-22 13:40:36 +08:00
kiwedespars
055d397e1e
adds tape
2020-08-21 13:34:02 -07:00
Letter N
f04918bdca
working code?
2020-08-21 15:09:49 +08:00
silicons
120bcfc00c
Merge pull request #13178 from lolman360/plumb
...
[READY] ports plumbing (no more waiting for tgui4)
2020-08-20 21:32:26 -07:00
lolman360
623fe1cb69
Update recipes_clothing.dm
2020-08-21 12:00:09 +10:00
lolman360
bda2c740ba
Merge branch 'master' into AnPrimAssistants
2020-08-21 11:08:13 +10:00
