Commit Graph

5947 Commits

Author SHA1 Message Date
YakumoChen
9325daa743 Update powersink.dm 2021-01-01 03:35:54 +00:00
necromanceranne
0aa5338f9b Adds wakibokken, puts bokken crafting into the craft menu, makes proper bokken a little harder to make but obviously an upgrade, makes crafted katanas and bokken have actual belt overlays 2021-01-01 05:42:28 +11:00
shellspeed1
b69132bede ports https://github.com/tgstation/tgstation/pull/52931 2020-12-31 00:34:44 -08:00
silicons
34256a61ef remove drips 2020-12-30 21:06:34 -08:00
SandPoot
1fa828a3f7 upload files 2020-12-30 13:57:10 -03:00
silicons
e6000ceffa meme 2020-12-29 11:12:06 -08:00
silicons
da25c48b2c Merge pull request #13855 from Chiirno/paramedBoxOffice
Paramed office on box + Surgery remodel
2020-12-29 01:27:49 -07:00
Letter N
51143f89e5 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-29 10:37:06 +08:00
DeltaFire
46a0c65e46 Merge branch 'master' into debris 2020-12-28 19:04:22 +01:00
DeltaFire
a390816092 Merge pull request #13888 from Citadel-Station-13/silicons-patch-48
adds vv wrapper for snowflake plushies
2020-12-28 17:42:26 +01:00
DeltaFire
8843a830d2 Merge pull request #13897 from keronshb/energybolafix
Fixess Energy Bola to be catchable
2020-12-28 17:08:29 +01:00
Letter N
ce5ab2f3a4 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-28 09:35:58 +08:00
keronshb
365abe1c5a Allows Energy Bola to be catchable
Allows Energy Bola to be catchable
2020-12-27 17:15:59 -05:00
silicons
d4f94724ec Update plushes.dm 2020-12-27 10:51:44 -07:00
silicons
798b1b50f4 Update plushes.dm 2020-12-27 10:38:07 -07:00
silicons
57d85f7e86 okay 2020-12-27 05:20:29 -08:00
silicons
a42fa987ba ok 2020-12-26 22:43:25 -08:00
silicons
5266ae1437 okay 2020-12-26 22:28:41 -08:00
silicons
bfb3d087c3 ok 2020-12-26 20:50:28 -08:00
silicons
d3414a4d23 ok 2020-12-26 20:47:50 -08:00
silicons
dafc6bf89f fix 2020-12-26 20:41:21 -08:00
silicons
3228435237 errors 2020-12-26 20:33:16 -08:00
silicons
6044086de0 changes 2020-12-26 20:29:52 -08:00
silicons
b7cd14b41e poggy? 2020-12-26 20:09:24 -08:00
Lin
b0b483105a Merge pull request #13857 from silicons/contractor_fix_for_real
fixes contractor pods this time for real (and 25% tested instead of 0%)
2020-12-26 23:52:51 +00:00
Timothy Teakettle
c3e9cdd9a5 finale 2020-12-26 23:09:19 +00:00
silicons
9f130e0c5a blood 2020-12-26 14:09:10 -08:00
silicons
5c0b4f824f hoh boy 2020-12-26 12:42:03 -08:00
silicons
45af2360ad changes 2020-12-26 11:35:47 -08:00
raspy-on-osu
0e652cb64c init 2020-12-26 06:02:09 -05:00
Letter N
1095142a5f Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-26 10:58:12 +08:00
silicons
5cf717e75d self message 2020-12-25 16:10:32 -08:00
silicons
5e66e4509f wew 2020-12-25 16:07:17 -08:00
Letter N
56fb81d02c Immursive Audio 2 2020-12-24 11:06:49 +08:00
silicons
bff30f587b sigh 2020-12-23 09:16:16 -07:00
zeroisthebiggay
3f36b95f92 a
a
2020-12-23 09:42:10 -05:00
Letter N
e9ca58446c Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-23 12:25:24 +08:00
DeltaFire
7da2f871d0 corrects comment 2020-12-23 03:02:42 +01:00
DeltaFire
8a5cdddb67 actually increases brass welder refueling speed 2020-12-23 02:57:01 +01:00
Chiirno
35896e92ec Paramedic office added and operating room remodeled 2020-12-22 21:50:22 -04:00
DeltaFire
4d4d0e9ec3 a fix fix 2020-12-23 02:50:15 +01:00
DeltaFire
bdbe1bc404 Merge pull request #13829 from silicons/keyloop
Bandaid fix for input controller lockup due to sleeping
2020-12-22 06:00:29 +01:00
zerothebigboy
dcecd6f03a pogbox 2020-12-21 18:28:52 -05:00
zerothebigboy
cca8dc3a36 pogbox 2020-12-21 18:25:33 -05:00
silicons
901fcddf44 Merge pull request #13819 from Hatterhat/surv-dag-buf
survival dagger light fix + butchery buff
2020-12-21 10:30:13 -07:00
silicons
0e7a597a2b alright 2020-12-21 10:27:28 -07:00
Letter N
abd94d1c03 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-21 21:19:06 +08:00
Letter N
98ff0a080e ImmursionAudio(TM) 2020-12-21 19:47:11 +08:00
Letter N
a808f805d4 ASYNC EVERYTHING! 2020-12-21 16:24:51 +08:00
DeltaFire
8414db5add Merge pull request #13814 from Xantholne/TwinSwordSheath
Fixes twin sword sheaths icon/item state from being blank sprites
2020-12-21 02:20:32 +01:00