Commit Graph

746 Commits

Author SHA1 Message Date
Putnam3145
4ff019f56e Inelastic exports shouldn't process 2021-06-21 07:47:13 -07:00
qweq12yt
0ca61af62a fixed combo lockers 2021-06-10 16:50:44 -03:00
silicons
4afb5209a1 Merge pull request #14637 from TheObserver-sys/DerringerPass1
Derringer Pass 1: No Rest for the Wicked(ly Bad Coder {me})
2021-05-07 18:42:24 -06:00
The0bserver
f1109c4f67 what a crate day (initial commit) 2021-05-01 02:15:07 -04:00
silicons
e3755fba92 Merge pull request #14639 from necromanceranne/cyberorgan_stuff_ye
Ports a significant amount of the tg cybernetic organ code + more
2021-04-28 21:20:57 -06:00
necromanceranne
0f04bbb23b Ports a significant amount of the tg cybernetic organ code while making some additional changes to their power 2021-04-22 13:06:31 +10:00
The0bserver
db046f3dbb I want to play Thermonuclear War (Initial Commit) 2021-04-21 03:12:01 -04:00
The0bserver
892dcaf976 dumdum crate now dumdum crate dumdum 2021-04-21 02:31:44 -04:00
The0bserver
7102ec121c missed one. 2021-04-21 02:31:08 -04:00
The0bserver
4e3ab78ebd Best to look the part. 2021-04-21 02:25:55 -04:00
The0bserver
57e0056ffc Spain without the S (Initial Commit) 2021-04-21 01:46:33 -04:00
silicons
0dcc6b44ba Merge pull request #14543 from qweq12yt/cargo-bugfixes
Cargo bugfixes
2021-04-18 18:52:54 -06:00
The0bserver
64a3cd9404 T. Derringer has twin calibers, Station gets .38 2021-04-13 23:22:35 -04:00
The0bserver
bcbccd864f I'm going monkey 2021-04-13 19:46:07 -04:00
The0bserver
2046ca2eb2 a test 2021-04-13 19:42:07 -04:00
The0bserver
2e65dbf07f Mandrill Maze 2021-04-13 18:45:01 -04:00
The0bserver
4b888fe715 Emag Crate 2021-04-13 18:28:58 -04:00
qweq12yt
c392d6e888 fix issue 2021-04-08 21:40:51 -03:00
qweq12yt
7ca46715d7 Merge branch 'master' into cargo-bugfixes 2021-04-08 19:15:55 -03:00
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
qweq12yt
37be0768b3 goodbye define - more comments 2021-03-31 01:08:01 -03:00
qweq12yt
2775543c97 additional comments 2021-03-31 00:46:07 -03:00
LetterN
f976a89157 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-31 08:19:31 +08:00
qweq12yt
04f90b749f fixes material crates not shipping 2021-03-30 12:33:23 -03: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