qweq12yt
|
780c401d5c
|
commented out rocket_boots, check comments
i could port it but i would like to pass it through other players/maintainers
|
2021-03-25 19:05:22 -03:00 |
|
qweq12yt
|
14e066fe61
|
oops left something behind, sorry
|
2021-03-25 18:44:28 -03:00 |
|
qweq12yt
|
d6ab576530
|
ported rocket boots
|
2021-03-25 18:17:47 -03:00 |
|
qweq12yt
|
ae44649950
|
ported the clear PDA
|
2021-03-25 18:15:48 -03:00 |
|
qweq12yt
|
13033bd7bb
|
availability for items tweaked, internals box added
|
2021-03-25 18:09:35 -03:00 |
|
qweq12yt
|
9015b22f62
|
removed wind-up gun and derringer from code
they were not ready, this branch is now more focused on adding stuff that is on the game already
|
2021-03-25 17:34:23 -03:00 |
|
qweq12yt
|
f784b849b8
|
removed derringer, it is not ready yet
|
2021-03-25 17:27:11 -03:00 |
|
qweq12yt
|
a22cfe5650
|
chances to appear, some price changes
|
2021-03-25 16:53:32 -03:00 |
|
qweq12yt
|
d856a1d2e0
|
added more items, stock/price/chance balance
|
2021-03-25 00:35:47 -03:00 |
|
qweq12yt
|
e70b03f770
|
fixes/balaces derringer/wind-up gun
|
2021-03-23 16:31:03 -03:00 |
|
qweq12yt
|
3b5ebd1149
|
windup fixes, derringer balancing?
|
2021-03-23 16:31:03 -03:00 |
|
qweq12yt
|
a16f5d04b7
|
partial derringer - windup needs balance
|
2021-03-23 16:31:02 -03:00 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
GrayRachnid
|
5201cf6ac5
|
stops racism
|
2021-03-17 21:58:41 -04:00 |
|
Ludox
|
fca5ede923
|
Shitcode has arrived
|
2021-03-18 02:32:54 +01:00 |
|
Lin
|
f3fb22a2ab
|
Merge pull request #14448 from Arturlang/give_fixes
Literally just adds targets to give because i forgot to do that
|
2021-03-17 16:32:11 -05:00 |
|
Hatterhat
|
5fa06109ac
|
lemme get uh
|
2021-03-17 15:49:57 -05:00 |
|