 silicons
|
1fd06a89b7
|
Oh Boy
|
2021-03-20 16:27:52 -07: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
|
957c1fcc5d
|
okay
|
2021-03-20 14:09:23 -07:00 |
|
|
silicons
|
427919d147
|
whew
|
2021-03-20 13:57:48 -07:00 |
|
|
silicons
|
604a6efeca
|
baton change
|
2021-03-20 13:45:39 -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
|
6491615775
|
Merge pull request #14461 from Hatterhat/violent-cafe
removes pacifism from ghost cafe
|
2021-03-20 14:28:33 -06:00 |
|
|
silicons
|
a1c4323653
|
Merge pull request #14457 from GrayRachnid/holopads
Fixes the bug that allows anybody(other than heads) to auto-call holopads and adds secure holopads.
|
2021-03-20 14:28:07 -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
|
a9a5bdc61a
|
Merge pull request #14471 from Citadel-Station-13/silicons-patch-9
fixes being able to reach into closed bodybags (couldn't webedit 2 files in one PR without being not lazy)
|
2021-03-19 21:08:39 -05:00 |
|
|
Lin
|
9e06bafcfb
|
Merge pull request #14470 from Citadel-Station-13/silicons-patch-8
no more bluespace bodybag of shotgun shells in pocket
|
2021-03-19 21:08:34 -05: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 |
|
|
necromanceranne
|
6a752cfd5d
|
Not quite right
|
2021-03-20 04:28:20 +11:00 |
|
|
necromanceranne
|
a61ac1fc68
|
Applies off balance on right click, allowing you to shove a weapon out of someones hands
|
2021-03-20 04:23:23 +11:00 |
|
|
LetterN
|
150f6f4328
|
cbt
|
2021-03-19 20:11:26 +08:00 |
|
|
ItzGabby
|
ea1cf6797e
|
I'm literally going to die with these checks
|
2021-03-19 02:59:30 -04: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 |
|
|
silicons
|
1f58e1823e
|
Update bodybag.dm
|
2021-03-18 17:00:16 -07:00 |
|
|
silicons
|
d434f60cb3
|
Update closets.dm
|
2021-03-18 16:59:03 -07: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 |
|
|
silicons
|
f6f2c27e90
|
Merge pull request #14442 from SandPoot/master
Adds the skirt variant of the "Tactitool Turtleneck" to the loadout
|
2021-03-18 06:40:51 -06:00 |
|
|
silicons
|
3e8fcfe72a
|
Merge pull request #14456 from Putnam3145/antag_pref
Added a "no antags please" pref
|
2021-03-18 06:39:48 -06:00 |
|
|
silicons
|
bb03d4ff41
|
Merge pull request #14446 from The-Sun-In-Splendour/secciejacket
shameless buff to sec jacket
|
2021-03-18 06:39:24 -06:00 |
|
|
silicons
|
e0cc6e3502
|
Merge pull request #14391 from kiwedespars/void-but-for-real
[HERETICS] Void & a handful of heretics-related PRS
|
2021-03-18 06:38:40 -06:00 |
|
|
Ludox
|
828cfaf58a
|
Cellular Emporium is gone 🦀
Prevents you from seeing cellular emporium despite not being able to use it (Post-absorb)
|
2021-03-18 04:32:33 +01:00 |
|