silicons
|
cbd7e0de6a
|
Merge pull request #14418 from LetterN/perlin-genny
Updates openspace & enables perlin generation on alvaland & icebox/snaxi
|
2021-04-06 04:10:00 -06:00 |
|
Lin
|
05ae354d87
|
Merge pull request #14565 from DeltaFire15/wood-pack-correction
Corrects the wood plank crate's name and description
|
2021-04-04 23:18:55 -05:00 |
|
Hatterhat
|
8b412d7d49
|
Update materials.dm (#14564)
|
2021-04-04 00:12:52 +02:00 |
|
DeltaFire
|
1e2b4c5a20
|
fix
|
2021-04-04 00:06:18 +02:00 |
|
LetterN
|
f976a89157
|
Merge remote-tracking branch 'origin/master' into perlin-genny
|
2021-03-31 08:19:31 +08:00 |
|
qweq12yt
|
ae39ba3cca
|
ok multiples of 5 tho
|
2021-03-27 11:38:58 -03:00 |
|
qweq12yt
|
afa68172ee
|
less smoke bombs
because maybe it would be abused too much?
|
2021-03-27 11:36:52 -03:00 |
|
qweq12yt
|
85cad7b51a
|
Merge branch 'master' into improvs-and-contraband
|
2021-03-27 11:33:01 -03:00 |
|
silicons
|
26b011bb8b
|
Merge pull request #14509 from R3dtail/patch-5
Adjusts blackmarket uplink
|
2021-03-27 01:34:02 -06:00 |
|
silicons
|
ce8342ed92
|
Merge pull request #14512 from R3dtail/patch-8
Gives the Blackmarket Uplink a description
|
2021-03-27 01:33:35 -06:00 |
|
silicons
|
bf382f490c
|
Merge pull request #14518 from necromanceranne/shield_explodies_fix
Shields: Changes, additional flags, bug fixes, sprites
|
2021-03-27 01:31:55 -06:00 |
|
qweq12yt
|
a4f0b749de
|
god damn GRAMMAR
|
2021-03-25 20:18:59 -03:00 |
|
qweq12yt
|
5e28d34a15
|
seed price adjustment
|
2021-03-25 20:04:51 -03:00 |
|
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 |
|
necromanceranne
|
2368968c66
|
Ports #42721 which happened to resolve this already
|
2021-03-26 08:45:14 +11: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
|
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 |
|
R3dtail
|
a8c6e2ee40
|
Update code/modules/cargo/blackmarket/blackmarket_uplink.dm
I never said I was good with words.
Co-authored-by: Hatterhat <31829017+Hatterhat@users.noreply.github.com>
|
2021-03-25 00:05:10 -05:00 |
|
R3dtail
|
a89fb1087c
|
Update blackmarket_uplink.dm
Gives the item a description and actually gives somewhat of an idea of what it does and how to use it
|
2021-03-24 22:46:12 -05:00 |
|
qweq12yt
|
d856a1d2e0
|
added more items, stock/price/chance balance
|
2021-03-25 00:35:47 -03:00 |
|
silicons
|
602140af99
|
Merge pull request #14497 from Hatterhat/lever-guns
.38 lever-action rifles but not actually implemented
|
2021-03-24 19:22:36 -06:00 |
|
R3dtail
|
32be7ecabd
|
Adjusts blackmarket uplink
Removes bone spears from the uplink, and makes EMP grenades rarer and more expensive
|
2021-03-24 16:53:41 -05:00 |
|
LetterN
|
e3fb2d5491
|
Merge remote-tracking branch 'origin/master' into perlin-genny
|
2021-03-24 21:55:47 +08:00 |
|
Hatterhat
|
30a9ad5059
|
yeehaw :)
|
2021-03-23 18:55:00 -05: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
|
715f86ef5c
|
Merge pull request #14447 from LetterN/fixes-2
Fixes laptop and tweaks stacks
|
2021-03-22 19:52:42 -05:00 |
|
LetterN
|
ce3c4e99ea
|
fix-but-its-in-the-wrong-branch
|
2021-03-21 13:46:18 +08:00 |
|
LetterN
|
292f67e098
|
Merge remote-tracking branch 'origin/master' into perlin-genny
|
2021-03-20 20:36:56 +08: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
|
228105b391
|
laptop and closet decon fix
|
2021-03-16 14:47:28 +08:00 |
|
Putnam
|
700bfd71e3
|
Also reduces nitryl since I changed that too
|
2021-03-14 20:28:35 -07:00 |
|
Putnam
|
c30fdfe5fc
|
Nerfs hyper-nob's point values
|
2021-03-14 20:14:32 -07:00 |
|
Letter N
|
935e46b492
|
The Mapping Update
Cleans up the map (again)
Makes mining code more better
|
2021-03-12 12:11:35 +08:00 |
|
Letter N
|
a43309a097
|
shuttle pog
|
2021-03-05 22:26:55 +08:00 |
|
Letter N
|
754c24748e
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-03-03 17:09:01 +08:00 |
|
Letter N
|
7c0a63f729
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-02-21 09:57:22 +08:00 |
|
Letter N
|
0bb5ec3316
|
Merge remote-tracking branch 'origin/master' into rustsql
|
2021-02-21 09:55:36 +08:00 |
|
Letter N
|
7d39949a2f
|
Merge remote-tracking branch 'origin/master' into rustsql
|
2021-02-19 12:38:32 +08:00 |
|
Letter N
|
037378eb7d
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-02-19 10:34:47 +08:00 |
|