Nadyr
4dded2ec62
powder that makes you say yes
2022-02-06 21:43:02 -05:00
Nadyr
84fc4e68c3
powder that makes you say yes
2022-02-06 21:41:20 -05:00
Nadyr
33403c6445
Merge branch 'master' into upstream-merge-12164
2022-02-06 21:38:32 -05:00
Nadyr
d074a0f756
Merge pull request #3624 from CHOMPStation2/upstream-merge-12161
...
[MIRROR] Allergy Rebuff
2022-02-06 21:32:49 -05:00
Nadyr
dd90a7eaa6
Merge pull request #3621 from CHOMPStation2/upstream-merge-12158
...
[MIRROR] Item Bank fixy!
2022-02-06 21:31:20 -05:00
Nadyr
0a454b6c3d
Merge pull request #3619 from CHOMPStation2/upstream-merge-12149
...
[MIRROR] makes amour for lucky
2022-02-06 21:02:24 -05:00
Nadyr
5eff6c2f63
Merge branch 'master' into upstream-merge-12158
2022-02-06 20:56:50 -05:00
Nadyr
8818ecf87a
powder that makes you say yes
2022-02-06 20:43:03 -05:00
Nadyr
2a5704f056
Merge pull request #3618 from CHOMPStation2/upstream-merge-12152
...
[MIRROR] Adds extra advice to Flavor Text popup
2022-02-06 20:42:18 -05:00
Nadyr
853f1b86a4
Merge pull request #3617 from CHOMPStation2/upstream-merge-12155
...
[MIRROR] Item bank!
2022-02-06 20:41:49 -05:00
Nadyr
03bae00061
Merge pull request #3616 from CHOMPStation2/upstream-merge-12151
...
[MIRROR] adds a catslug crate to cargo
2022-02-06 20:40:53 -05:00
Nadyr
4efce5f15f
Merge pull request #3615 from CHOMPStation2/upstream-merge-12146
...
[MIRROR] skimpy cap "dress" probably more like a leotard idk
2022-02-06 20:36:30 -05:00
Nadyr
4b2b0c85bc
Merge pull request #3614 from CHOMPStation2/upstream-merge-12150
...
[MIRROR] mining vendor 1000 thaler reward
2022-02-06 20:35:33 -05:00
Nadyr
c4ec073076
Merge pull request #3613 from CHOMPStation2/upstream-merge-12145
...
[MIRROR] makes a single t3 brace actually support its drill
2022-02-06 20:35:12 -05:00
Nadyr
6bc18000c5
Merge pull request #3611 from CHOMPStation2/upstream-merge-12143
...
[MIRROR] Return to Tether
2022-02-06 20:03:12 -05:00
Nadyr
f62c4d69bc
Merge pull request #3612 from CHOMPStation2/upstream-merge-11763
...
[MIRROR] Talon Improvements, Take 2
2022-02-06 19:50:28 -05:00
Nadyr
010390191c
powder that makes you say yes
2022-02-06 19:49:36 -05:00
Nadyr
fb8a1a2368
Merge pull request #3610 from Cyrelius/master
...
Update southern_cross_defines.dm
2022-02-06 19:33:00 -05:00
Nadyr
f48824843e
Merge pull request #3609 from CHOMPStation2/upstream-merge-12148
...
[MIRROR] [station] tag for paperwork
2022-02-06 18:58:04 -05:00
Casey
80e943716f
talon miner
2022-02-06 23:21:47 +00:00
CHOMPStation2
c9eae9e977
Allergy Rebuff
2022-02-06 23:11:19 +00:00
Casey
81be0362a3
Merge pull request #12161 from KillianKirilenko/kk-test
...
Allergy Rebuff
2022-02-06 23:11:19 +00:00
Casey
56d47d2cc1
Item Bank fixy!
2022-02-06 15:46:27 +00:00
Casey
9379f4d1bc
makes amour for lucky
2022-02-06 14:18:49 +00:00
CHOMPStation2
92c1f23fa7
Adds extra advice to Flavor Text popup
2022-02-06 14:18:40 +00:00
Casey
6e4bebaf2a
Merge pull request #12152 from Heroman3003/flavor-not-literally
...
Adds extra advice to Flavor Text popup
2022-02-06 14:18:40 +00:00
Casey
525f23c91c
Item bank!
2022-02-06 14:18:31 +00:00
CHOMPStation2
a4e31967cf
adds a catslug crate to cargo
2022-02-06 14:16:18 +00:00
Casey
b77383ecce
Merge pull request #12151 from PastelPrinceDan/catslugcrate
...
adds a catslug crate to cargo
2022-02-06 14:16:18 +00:00
CHOMPStation2
7d519d617e
skimpy cap "dress" probably more like a leotard idk
2022-02-06 14:15:07 +00:00
Casey
86ca5e5d49
Merge pull request #12146 from Hatterhat/formal-in-the-loosest-sense
...
skimpy cap "dress" probably more like a leotard idk
2022-02-06 14:15:06 +00:00
CHOMPStation2
675a81c961
mining vendor 1000 thaler reward
2022-02-06 14:13:55 +00:00
Casey
e5665c54cf
Merge pull request #12150 from PastelPrinceDan/moni
...
mining vendor 1000 thaler reward
2022-02-06 14:13:55 +00:00
CHOMPStation2
cf0a27146b
makes a single t3 brace actually support its drill
2022-02-06 14:12:43 +00:00
Casey
84b984a731
Merge pull request #12145 from Hatterhat/t3drill
...
makes a single t3 brace actually support its drill
2022-02-06 14:12:43 +00:00
Casey
7f3da20187
Talon Improvements, Take 2
2022-02-06 14:07:23 +00:00
Casey
d38c2c3ac3
Return to Tether
2022-02-06 14:05:08 +00:00
Cyrelius
74cf803b31
Update mechfab_designs_ch.dm
...
Fix minor mistake.
2022-02-04 23:51:45 -08:00
Cyrelius
f7a63d554a
Update armor.dm
...
*hopefully* made the strange mecha plating that the phazons get less shitty. I'll need to observe its performance in-game to actually determine how much less shitty it should be, as I'm only figuring this stuff out.
2022-02-03 22:24:59 -08:00
Cyrelius
f88c414a72
Update phazon.dm
...
Adjusted the number of slots that both phazons have, making the Janus better and the normal phazon worse. Bumped up the health of the normal phazon by 50 to 250 and removed its ability to cloak, which will be unique to the Janus and Scuttlebug. This makes the phazon a solid tier 4 mech, and makes it not overpowered for something science can build.
Will change the armor later, as I intend to change a lot of those.
2022-02-03 22:18:06 -08:00
Cyrelius
f8a96a807f
Update mechfab_designs_ch.dm
...
Adds the Phazon to the Exosuit fabricator's crafting menu with what I think are appropriate costs.
2022-02-03 21:31:15 -08:00
Cyrelius
1d06f2ff55
Update mechfab_designs.dm
...
Re-enabled the shields that Virgo disabled, though I did make them a bit higher on the tech list, and added verdantium to their cost.
2022-02-03 20:57:01 -08:00
Cyrelius
1c789e96dd
Update southern_cross_defines.dm
...
Make the maps down on the planet spicier.
Not much for the mines, a little more for the plains, and a lot for the wilderness.
2022-02-03 20:35:29 -08:00
CHOMPStation2
450a7e98ee
[station] tag for paperwork
2022-02-04 04:16:47 +00:00
Casey
8ee12c5a16
Merge pull request #12148 from KillianKirilenko/kk-test
...
[station] tag for paperwork
2022-02-04 04:16:47 +00:00
Nadyr
fe6d93ab55
Merge pull request #3607 from CHOMPStation2/upstream-merge-12137
...
[MIRROR] updated (humanoid) radsuit sprites
2022-02-03 23:16:26 -05:00
Nadyr
d4bd9a0e19
powder that makes you say yes
2022-02-03 22:52:30 -05:00
Nadyr
1932d42388
Merge pull request #3606 from CHOMPStation2/upstream-merge-12142
...
[MIRROR] Minor food tweaks
2022-02-03 22:51:11 -05:00
Nadyr
595837d18d
Merge pull request #3605 from CHOMPStation2/upstream-merge-12128
...
[MIRROR] Xenobotany Pass 1 (Of who knows how many)
2022-02-03 22:50:32 -05:00
Nadyr
1d27bf55c1
Merge pull request #3604 from CHOMPStation2/upstream-merge-12122
...
[MIRROR] [MIRROR] Adds caseless BB rounds for common gun types
2022-02-03 22:48:48 -05:00
