Commit Graph

74957 Commits

Author SHA1 Message Date
Nadyr
d83d7fcd3c Merge pull request #6306 from CHOMPStation2/upstream-merge-14954
[MIRROR] Modifies bloodsucker subtle bleedless mode to NOT leave bloodsplatter
2023-06-09 22:19:01 -04:00
Nadyr
002a1e1ce3 Merge pull request #6301 from CHOMPStation2/upstream-merge-14946
[MIRROR] Changes bloodsucker subtle mode to use italics rather than bold
2023-06-09 22:05:10 -04:00
Nadyr
ea3c4ec289 Merge pull request #6299 from CHOMPStation2/upstream-merge-14942
[MIRROR] Zera's Purple Cloak
2023-06-09 21:58:40 -04:00
Nadyr
40fb57dab4 Merge pull request #6298 from CHOMPStation2/upstream-merge-14940
[MIRROR] Hell of a Crate time!
2023-06-09 21:52:22 -04:00
Nadyr
e6c29b72a5 Merge pull request #6303 from CHOMPStation2/upstream-merge-14935
[MIRROR] Adds a set of admin verbs for speaking/emoting as objs/mobs/turf without possessing them
2023-06-09 21:50:24 -04:00
Nadyr
812e3b85ab Merge pull request #6300 from CHOMPStation2/upstream-merge-14943
[MIRROR] Modifies scug picnic to use picnic blanket, makes it more aesthetically pleasing
2023-06-09 21:47:14 -04:00
Nadyr
cd32adc93a Merge pull request #6297 from CHOMPStation2/upstream-merge-14938
[MIRROR] Variety Add-on
2023-06-09 21:46:13 -04:00
Nadyr
088d87cb57 Merge pull request #6293 from CHOMPStation2/upstream-merge-14931
[MIRROR] Items for the Plant People (not the literal plant people)
2023-06-09 21:45:16 -04:00
Nadyr
27fad38be0 powder that makes you say yes 2023-06-09 21:44:45 -04:00
Nadyr
811dcb945f powder that makes you say yes 2023-06-09 21:43:29 -04:00
Nadyr
234de98640 powder that makes you say yes 2023-06-09 21:41:10 -04:00
Nadyr
8fd186a21a powder that makes you say yes 2023-06-09 21:34:21 -04:00
Nadyr
5aa4bab24a Merge pull request #6296 from FluffMedic/Mistakes
Trying to make amends.
2023-06-09 21:32:50 -04:00
Nadyr
83242d1b76 Merge pull request #6294 from CHOMPStation2/upstream-merge-14932
[MIRROR] New Inflatable Sprites (Not that type of inflation. Or economic inflation.)
2023-06-09 21:30:53 -04:00
Nadyr
14d919f6ce powder that makes you say yes 2023-06-09 21:29:08 -04:00
Nadyr
8ab286b258 Merge pull request #6290 from CHOMPStation2/upstream-merge-14925
[MIRROR] mecha medigun required_type fix
2023-06-09 21:28:14 -04:00
Nadyr
1b6e976858 Merge pull request #6292 from CHOMPStation2/nanomaps_generation
Automatic NanoMap Update
2023-06-09 21:27:27 -04:00
Nadyr
a06f376833 Merge pull request #6289 from CHOMPStation2/upstream-merge-14928
[MIRROR] The Suits of the Void
2023-06-09 21:26:44 -04:00
Nadyr
d987605022 Merge pull request #6288 from CHOMPStation2/upstream-merge-14916
[MIRROR] Medical Mayhem
2023-06-09 21:26:00 -04:00
Nadyr
35b9e6ecb5 Merge pull request #6287 from CHOMPStation2/upstream-merge-14914
[MIRROR] Changes The Boozemat (It's 5:45am - I can't think of any good jokes)
2023-06-09 21:24:52 -04:00
Nadyr
e512fe3854 Merge pull request #6286 from CHOMPStation2/upstream-merge-14920
[MIRROR] "You're late, go clock in..."
2023-06-09 21:23:23 -04:00
Nadyr
fddcbf1fcc Merge pull request #6285 from CHOMPStation2/upstream-merge-14912
[MIRROR] It's all bout that Money Money Money
2023-06-09 21:21:13 -04:00
Nadyr
c9055c240b Merge pull request #6282 from FluffMedic/Xenoarch
Fixing a typo
2023-06-09 21:20:05 -04:00
Nadyr
6463248ed5 Merge pull request #6284 from CHOMPStation2/upstream-merge-14930
[MIRROR] Buffs harm-injection
2023-06-09 21:18:32 -04:00
Kassc
3129a35fe2 Merge pull request #6324 from Kazzc/Examplemaps
ExampleMaps-1.1
2023-06-04 23:08:59 -04:00
NanoMap Generation
82d716a3ed NanoMap Auto-Update (Sun Jun 4 23:29:29 UTC 2023) 2023-06-04 23:29:30 +00:00
Razgriz
1a5d27a80b Merge pull request #6321 from FluffMedic/Cultist
Fixing an area/space
2023-06-04 16:26:58 -07:00
Fluff
ceb99b32e7 Also fixes a mistake
The mining satchel of holding was meant to be a pouch of holding.
2023-06-04 19:26:05 -04:00
Fluff
0ef7dec557 Fixing an area/space
Title
2023-06-04 18:43:32 -04:00
Kassc
221eebc2df Merge pull request #6295 from FluffMedic/Cultist
Alt Version Of Deep Wilds POIs
2023-06-04 14:29:10 -04:00
Kassc
271c76a9c8 Merge pull request #6234 from Darlantanis/VRunjank
VR tweaks and mob transformation
2023-06-04 14:26:38 -04:00
Kassc
8e21814762 ExampleMaps-1.1
Some minor additions.
-Cable directions
-Pipes directions
-Ship example
2023-06-03 18:47:51 -04:00
CHOMPStation2
9d50855aa9 Modifies bloodsucker subtle bleedless mode to NOT leave bloodsplatter 2023-06-03 19:08:16 +00:00
Heroman3003
eace150b2b Merge pull request #14954 from Runa-Dacino/subtledrips
Modifies bloodsucker subtle bleedless mode to NOT leave bloodsplatter
2023-06-03 19:08:16 +00:00
CHOMPStation2
ed95c613e1 Adds a set of admin verbs for speaking/emoting as objs/mobs/turf without possessing them 2023-06-03 09:22:13 +00:00
Heroman3003
a053cba8e8 Merge pull request #14935 from Runa-Dacino/ventroliquism
Adds a set of admin verbs for speaking/emoting as objs/mobs/turf without possessing them
2023-06-03 09:22:13 +00:00
CHOMPStation2
4f6c2835dd Changes bloodsucker subtle mode to use italics rather than bold 2023-06-03 09:21:02 +00:00
Heroman3003
ab18ffabbc Merge pull request #14946 from Runa-Dacino/italianpasta
Changes bloodsucker subtle mode to use italics rather than bold
2023-06-03 09:21:02 +00:00
CHOMPStation2
653219f215 Modifies scug picnic to use picnic blanket, makes it more aesthetically pleasing 2023-06-03 09:20:57 +00:00
Heroman3003
000a9e3989 Merge pull request #14943 from Runa-Dacino/scugpicnic_p2
Modifies scug picnic to use picnic blanket, makes it more aesthetically pleasing
2023-06-03 09:20:57 +00:00
Heroman3003
bf4c7eeffe Zera's Purple Cloak 2023-06-03 09:20:53 +00:00
CHOMPStation2
121e10ee1e Hell of a Crate time! 2023-06-03 09:20:48 +00:00
Heroman3003
e112b42b95 Merge pull request #14940 from Youtubeboy139/Fixes-crates
Hell of a Crate time!
2023-06-03 09:20:48 +00:00
Heroman3003
2c0cff3885 Variety Add-on 2023-06-03 09:20:41 +00:00
Fluff
17f0d50d6c Trying to make amends.
I tried to created boss mobs and difficult foes.
Made them too lethal.
I'll try to properly write stuff down in the morning but basically

Eclipse -> All shootslower, and deal less damage.
Phazon -> Missle destructive ranges deceased
Boss Hivebot -> Singulairty attack changed priortity, new hivebot summon attack
Precursor hivebot -> All can drop minor things, health decreased
Phazon - Base version no longer does rad attacks, instead does basic explosiove/fuel rod shots...actually I will likly change this in the morning.
2023-06-03 00:04:06 -04:00
Nadyr
515d0e49ba Merge pull request #6268 from CHOMPStation2/upstream-merge-14922
[MIRROR] Adds new shoe: "Elegant Sandals". Adds it to loadout
2023-06-02 18:45:58 -04:00
Nadyr
0db6889caa Merge pull request #6269 from CHOMPStation2/upstream-merge-14915
[MIRROR] Adds scrollbar to medical and employment records computers
2023-06-02 18:45:18 -04:00
Fluff
26756f33e2 Alt Version Of Deep Wilds POIs
Adds some alternate versions of some Deep Wilds POIs. Whether some mobs are swaped out, locations swapped, terrain altered, intended path changed, etc.
2023-06-02 12:15:22 -04:00
CHOMPStation2
ea0662e135 New Inflatable Sprites (Not that type of inflation. Or economic inflation.) 2023-06-02 01:22:39 +00:00
Heroman3003
db6f6f0a15 Merge pull request #14932 from Youtubeboy139/inflatables
New Inflatable Sprites (Not that type of inflation. Or economic inflation.)
2023-06-02 01:22:39 +00:00