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 |
|
necromanceranne
|
2368968c66
|
Ports #42721 which happened to resolve this already
|
2021-03-26 08:45:14 +11: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 |
|
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 |
|
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 |
|
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
|
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 |
|
SmArtKar
|
756be084bc
|
Decks are saveable!
|
2021-02-17 18:50:23 +03:00 |
|
Letter N
|
6286d40082
|
code works
|
2021-02-12 17:26:08 +08:00 |
|
Letter N
|
3167dd8e22
|
atmos cc, cpl
|
2021-02-12 11:50:39 +08:00 |
|
Letter N
|
8a0c932d55
|
oops! All Refactors!
|
2021-02-12 11:07:58 +08:00 |
|
SmArtKar
|
2cd339f776
|
Adds Card Ops bundle
|
2021-02-04 18:57:00 +03:00 |
|
SmArtKar
|
7b2e1ef44f
|
TCG!
|
2021-02-02 14:40:29 +03:00 |
|
Letter N
|
125cd17cee
|
Merge remote-tracking branch 'origin/master' into rustsql
|
2021-01-20 15:40:41 +08:00 |
|
Letter N
|
021b28a2b7
|
cleanup
shitcode - b - gone
|
2021-01-20 11:08:21 +08:00 |
|
Lin
|
b7cf425dff
|
Merge pull request #13988 from DeltaFire15/who-reads-these-anyways
[s] we love private orders
|
2021-01-08 01:08:31 +00:00 |
|
DeltaFire
|
e37790a997
|
fix
|
2021-01-07 00:23:18 +01:00 |
|
MrJWhit
|
abffac67b2
|
Port'n
|
2021-01-06 03:16:08 -05:00 |
|
Letter N
|
cd5d558fad
|
safety? what's that?
* maybe table-breaking change
|
2021-01-04 11:57:12 +08:00 |
|
silicons
|
c947dfdca5
|
Merge pull request #13940 from Chiirno/CargoParamedSuit
Paramedic EVA suit now purchasable from Cargo
|
2021-01-03 18:09:59 -07:00 |
|
Chiirno
|
6f5837d14f
|
changed the description of the crate.
|
2020-12-31 17:42:07 -04:00 |
|
Chiirno
|
d936b43e98
|
adjusted the price to 1975. Above eva suit at 1500 and beow medical hardsuit at 2750
|
2020-12-31 17:27:25 -04:00 |
|
Chiirno
|
7d0c4030c9
|
first commit, adding the paramed eva suit as an option for cargo.
|
2020-12-31 17:24:30 -04:00 |
|
Xantholne
|
0db821f4f5
|
Fixes missing electus red from trying to be basic parrot and adds
|
2020-12-29 19:33:09 -07:00 |
|
Xantholne
|
51ac7286e6
|
aaaaaaa
|
2020-12-28 00:57:32 -07:00 |
|
Xantholne
|
2cca3314a7
|
Adds to bird crate
|
2020-12-27 23:55:58 -07:00 |
|
silicons
|
bff30f587b
|
sigh
|
2020-12-23 09:16:16 -07:00 |
|
silicons
|
1b11005e09
|
fix
|
2020-12-21 13:51:27 -07:00 |
|
Hatterhat
|
2a05c9df24
|
mechs leave no wrecks on sell
|
2020-12-12 21:25:17 -06:00 |
|