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
Nadyr
d49af9b543
Merge pull request #3603 from CHOMPStation2/upstream-merge-12119
...
[MIRROR] [MIRROR] Cynosure map fixes round 8
2022-02-03 22:48:19 -05:00
Nadyr
4fb570d22f
Merge pull request #3602 from CHOMPStation2/upstream-merge-12140
...
[MIRROR] Startreader Stunlocks Begone
2022-02-03 22:45:14 -05:00
Nadyr
7315710ba0
Merge pull request #3575 from Cyrelius/master
...
Yet another patch for borgs.
2022-02-03 22:18:01 -05:00
Razgriz
64cb81e379
Merge pull request #3608 from Verkister/patch-75
...
Possibly fixes some spiderling jank
2022-02-03 10:22:43 -07:00
Verkister
921c1d6337
Possibly fixes some spiderling jank
...
Ran out of brain juice trying to figure out the bugginess further but the wacky placement of this stuff got me sussy enough to try something. will see if anything happens and maybe toss upstream if so.
If my hunch is correct this might fix excess unregistered spiderling spawning and the bug with infinitely squishable undeleted squishees.
2022-02-03 19:08:30 +02:00
Casey
ba5fa3c9f4
updated (humanoid) radsuit sprites
2022-02-03 06:31:18 +00:00
CHOMPStation2
c37bbf0b0b
Minor food tweaks
2022-02-03 06:31:10 +00:00
Casey
de56611efc
Merge pull request #12142 from Heroman3003/foodtweak
...
Minor food tweaks
2022-02-03 06:31:10 +00:00
CHOMPStation2
43845c45b0
Xenobotany Pass 1 (Of who knows how many)
2022-02-03 06:29:57 +00:00
Casey
4763264965
Merge pull request #12128 from TheObserver-sys/XenoBotanyPass1
...
Xenobotany Pass 1 (Of who knows how many)
2022-02-03 06:29:57 +00:00
CHOMPStation2
7b27e8dc01
[MIRROR] Adds caseless BB rounds for common gun types
2022-02-03 06:28:46 +00:00
Casey
a8d3dce15f
Merge pull request #12122 from VOREStation/upstream-merge-8385
...
[MIRROR] Adds caseless BB rounds for common gun types
2022-02-03 06:28:45 +00:00
CHOMPStation2
b92e2e1b96
[MIRROR] Cynosure map fixes round 8
2022-02-03 06:27:32 +00:00
Casey
e080a6cd71
Merge pull request #12119 from VOREStation/upstream-merge-8382
...
[MIRROR] Cynosure map fixes round 8
2022-02-03 06:27:32 +00:00
CHOMPStation2
b5c2ef52c2
Startreader Stunlocks Begone
2022-02-01 19:49:50 +00:00
Casey
daa703ac73
Merge pull request #12140 from KillianKirilenko/kk-test
...
Startreader Stunlocks Begone
2022-02-01 19:49:49 +00:00
Razgriz
e1b05dfd49
Merge pull request #3600 from CHOMPStation2/upstream-merge-12132
...
[MIRROR] Fixes station preset relays
2022-01-31 08:03:17 -07:00
CHOMPStation2
7b3c750db0
Fixes station preset relays
2022-01-31 05:00:06 +00:00
Casey
d9ca6e2487
Merge pull request #12132 from Very-Soft/fixpresettelecomms
...
Fixes station preset relays
2022-01-31 05:00:05 +00:00
Cyrelius
6ecaa54625
Update phase.dm
...
Add chompedit tags as requested.
2022-01-29 21:00:25 -08:00
Cyrelius
008bf33299
Merge branch 'CHOMPStation2:master' into master
2022-01-29 16:38:44 -08:00
