silicons
|
5910950a49
|
Merge pull request #14473 from ItzGabby/bark-box
Bark Box Remastered Edition
|
2021-03-22 21:15:14 -06:00 |
|
silicons
|
bfb122d706
|
Merge pull request #14475 from qweq12yt/black-market-fixes
Black Market: The return
|
2021-03-22 21:14:57 -06:00 |
|
Hatterhat
|
d9977e24b5
|
Update medicine.dm
|
2021-03-22 21:29:48 -05:00 |
|
Hatterhat
|
6bac90f8de
|
uhh initial commit ig
|
2021-03-22 21:23:00 -05:00 |
|
Hatterhat
|
e5c01bc0f8
|
limbgrower limbs can be used in augmentations
|
2021-03-22 20:15:01 -05:00 |
|
Lin
|
dd764ceb0e
|
Merge pull request #14491 from Hatterhat/triggerfix
noguns now takes precedence over trigger guard
|
2021-03-22 19:55:12 -05:00 |
|
Lin
|
715f86ef5c
|
Merge pull request #14447 from LetterN/fixes-2
Fixes laptop and tweaks stacks
|
2021-03-22 19:52:42 -05:00 |
|
Lin
|
4e641eedb9
|
Merge pull request #14489 from LetterN/amogus
Fixes NIRM
|
2021-03-22 15:37:56 -05:00 |
|
LetterN
|
760a7de229
|
Merge remote-tracking branch 'origin/master' into fixes-2
|
2021-03-22 09:32:21 +08:00 |
|
Hatterhat
|
722b50088a
|
message tweak
Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
|
2021-03-21 19:26:34 -05:00 |
|
Hatterhat
|
a8e4466476
|
sigh
|
2021-03-21 18:16:22 -05:00 |
|
LetterN
|
86b8bbf727
|
no more free shipping
|
2021-03-21 21:44:04 +08:00 |
|
LetterN
|
8d9c4f55d6
|
no dumb names
|
2021-03-21 13:51:08 +08:00 |
|
LetterN
|
ce3c4e99ea
|
fix-but-its-in-the-wrong-branch
|
2021-03-21 13:46:18 +08:00 |
|
zeroisthebiggay
|
b292fcb1dd
|
Update strained_muscles.dm
|
2021-03-20 19:52:39 -04:00 |
|
zeroisthebiggay
|
f4b3d7274c
|
Update strained_muscles.dm
|
2021-03-20 19:50:13 -04:00 |
|
zeroisthebiggay
|
bc3a2e19b2
|
Update strained_muscles.dm
|
2021-03-20 19:44:41 -04:00 |
|
zeroisthebiggay
|
531409e472
|
Update strained_muscles.dm
|
2021-03-20 19:39:57 -04:00 |
|
zerothebigboy
|
969f64af1a
|
f u c k
|
2021-03-20 19:23:55 -04:00 |
|
silicons
|
02b52e6142
|
framework
|
2021-03-20 16:02:26 -07:00 |
|
silicons
|
efa4139aff
|
math fix
|
2021-03-20 14:17:13 -07:00 |
|
silicons
|
5b2a42f254
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-03-20 14:13:23 -07:00 |
|
silicons
|
427919d147
|
whew
|
2021-03-20 13:57:48 -07:00 |
|
silicons
|
15dd80a085
|
less awful
|
2021-03-20 13:39:59 -07:00 |
|
silicons
|
720f525683
|
Merge pull request #14323 from dzahlus/hierophant-esword-no-more
Hierophant staff no longer deals 30 damage
|
2021-03-20 14:32:14 -06:00 |
|
silicons
|
295255e46e
|
Merge pull request #14405 from Arturlang/vampire_death
Makes vampries dust when they can't pay the blood cost, not before
|
2021-03-20 14:31:14 -06:00 |
|
silicons
|
af540ba4ef
|
Merge pull request #14469 from timothyteakettle/puddles-2-electric-boogaloo
fixes puddles breaking
|
2021-03-20 14:30:10 -06:00 |
|
silicons
|
74e26f7a0c
|
Merge pull request #14436 from Putnam3145/supermatter-surge-rebalance
Buffed supermatter surge to make it up to 50x as strong as before.
|
2021-03-20 14:29:40 -06:00 |
|
silicons
|
e433aaf881
|
Merge pull request #14464 from GrayRachnid/filter
Enables the in character filter for server configuration
|
2021-03-20 14:28:40 -06:00 |
|
silicons
|
77178c7664
|
Fix
|
2021-03-20 12:14:38 -07:00 |
|
silicons
|
d9a2316825
|
fix
|
2021-03-20 12:13:28 -07:00 |
|
Blue Wildrose
|
c02f35a7e5
|
Glowing goo be gone
|
2021-03-20 11:29:15 -07:00 |
|
Blue Wildrose
|
bc36e73c7e
|
maybe I should include this check
|
2021-03-20 06:52:13 -07:00 |
|
Blue Wildrose
|
3a37cc6325
|
Some sensory detail
|
2021-03-20 06:37:37 -07:00 |
|
LetterN
|
292f67e098
|
Merge remote-tracking branch 'origin/master' into perlin-genny
|
2021-03-20 20:36:56 +08:00 |
|
silicons
|
1b622af5e7
|
Merge pull request #14465 from The-Sun-In-Splendour/fix-post-absorb-revive
Fixes post absorb revive
|
2021-03-20 01:30:37 -06:00 |
|
Lin
|
51b955d47e
|
Merge pull request #14460 from Hatterhat/exp-sup-con
moves the express supply console and upgrade disk to appropriate tabs
|
2021-03-19 19:18:19 -05:00 |
|
qweq12yt
|
265af827b8
|
ah you pesky ambiguity
|
2021-03-19 17:58:30 -03:00 |
|
qweq12yt
|
4838dd40de
|
small typo
|
2021-03-19 16:06:23 -03:00 |
|
qweq12yt
|
a3ba3c1928
|
fix ui not opening
|
2021-03-19 15:36:14 -03:00 |
|
kappa-sama
|
1f7b15d8f8
|
clonwops
|
2021-03-19 15:35:17 -03:00 |
|
kappa-sama
|
2e41925392
|
poggers
Co-authored-by: lolman360 <22850904+lolman360@users.noreply.github.com>
|
2021-03-19 15:32:54 -03:00 |
|
kappa-sama
|
524bb79f0e
|
tgui machine broke
|
2021-03-19 15:32:53 -03:00 |
|
ItzGabby
|
68bf156091
|
Merge branch 'master' into bark-box
|
2021-03-19 02:48:31 -04:00 |
|
ItzGabby
|
4a49f6eebe
|
barked on
|
2021-03-19 01:38:17 -04:00 |
|
silicons
|
d7829db9ca
|
let's make this more clear
|
2021-03-18 21:55:21 -07:00 |
|
silicons
|
bff668b743
|
why
|
2021-03-18 21:53:53 -07:00 |
|
LetterN
|
2c2e779aa6
|
Merge remote-tracking branch 'origin/master' into fixes-2
|
2021-03-19 10:28:43 +08:00 |
|
Timothy Teakettle
|
71d5528959
|
fix
|
2021-03-18 21:50:03 +00:00 |
|
silicons
|
8c97297a47
|
Merge pull request #14444 from DeltaFire15/jar-removal
Locks Bluespace Jars to be admin-only
|
2021-03-18 06:41:38 -06:00 |
|