Commit Graph

3192 Commits

Author SHA1 Message Date
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
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
silicons
4d7d068407 Update airlock.dm (#13182) 2020-08-23 21:01:26 +02: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
Ghommie
fde859bca0 Removing priority overlays, update_icon() splitup for guns. 2020-08-20 18:33:23 +02:00
Letter N
8d70e21239 the unexpected paperwork update. paperwork rp? And also includes ntnet upgrade because fuck it. 2020-08-20 19:40:47 +08:00
Letter N
3b7bca28b3 Functional* code 2020-08-20 13:50:33 +08:00
lolman360
4259332cfd e 2020-08-19 18:37:31 +10:00
Putnam
81dc6c7ee5 Ports reftracking from TG. 2020-08-18 20:41:43 -07:00
silicons
0331f0cdc3 Merge pull request #13189 from timothyteakettle/revert-13187-revert-13110-cum
Revert "[TESTMERGE ONLY] FUCK"
2020-08-18 18:52:52 -07:00
lolman360
7390effcb9 e 2020-08-18 19:09:01 +10:00
lolman360
b466a5aae9 e 2020-08-18 18:57:23 +10:00
lolman360
9931cb006c eee 2020-08-18 17:33:20 +10:00
kiwedespars
bd239b01b3 Update recipes_clothing.dm 2020-08-17 23:52:41 -07:00
lolman360
3040032409 documentation updates 2020-08-18 15:42:19 +10:00
Putnam3145
23b4ba3714 Merge pull request #13063 from silicons/supermatter
Ports /tg/ supermatter - no more infinite stunlock death on charge inertia delaminations
2020-08-17 03:13:14 -07:00
Timothy Teakettle
f5300750b5 Revert "[TESTMERGE ONLY] FUCK" 2020-08-17 03:18:36 +01:00
silicons
4cd731ce11 Revert "cease your shitcode: cum edition" 2020-08-16 19:06:57 -07:00
silicons
8dedcbcf76 Merge branch '13113' 2020-08-16 18:53:35 -07:00
silicons
ac7bdb5db5 Merge branch '13175' 2020-08-16 18:53:00 -07:00
silicons
2095e2705f Merge branch '13169' 2020-08-16 18:52:13 -07:00
silicons
b56742beb5 Merge branch 'pr-13110' 2020-08-16 18:40:23 -07:00
Lin
d287f44d9a Merge pull request #13045 from silicons/coggers
ports bronze (fake clockwork) airlocks and windows
2020-08-16 20:20:03 -05:00
kiwedespars
7c653d0891 i actually kinda like the idea that you need a point for paths.
- whoops actually increases stamdamage of mansus grasp to 60.
- ascensions bumped up to 5 each.
- recipe for a codex made a bit harder.
2020-08-16 04:34:04 -07:00
zeroisthebiggay
167ff93675 Update space.dm
t e x t
2020-08-15 17:10:24 -04:00
zeroisthebiggay
730f18b239 Rename code/datums/ru to code/datums/ruins/space.dm
also im an rword
2020-08-15 17:07:51 -04:00
zeroisthebiggay
04055d34a2 Update and rename code/datums/ruins/space.dm to code/datums/ru
get it space bar
2020-08-15 16:31:17 -04:00
zerothebigboy
3bce862a28 a 2020-08-15 16:27:27 -04:00
zerothebigboy
d500052779 a 2020-08-15 16:27:17 -04:00
zerothebigboy
853604b218 a 2020-08-15 16:24:30 -04:00