Commit Graph

724 Commits

Author SHA1 Message Date
Fluff
cc1d50c3ee Fixing the butchering bug
Removed the uncommenting of code for a later PR
2023-07-12 16:38:38 -04:00
kcin2001
748b2f4fec misc borg fixes 2023-07-11 23:38:12 -07:00
Raeschen
45aab97c96 Update player_tips_list.dm 2023-07-11 20:09:47 +02:00
FluffMedic
32b912469d Merge branch 'CHOMPStation2:master' into craft 2023-07-11 13:49:26 -04:00
Raeschen
45f1f50be0 Merge branch 'master' into technomancer 2023-07-07 19:57:14 +02:00
Selis
0e878ffb4c Little correction 2023-07-07 10:59:30 +02:00
Selis
3f683db523 Double reply & href fixes 2023-07-07 10:53:53 +02:00
Selis
86ef1f4708 Adds an missing admin href token 2023-07-07 10:11:36 +02:00
Raeschen
59f7191c96 Fix a missed name chane with wolf 2023-07-05 18:07:57 +02:00
Fluff
866b31da0e Merge remote-tracking branch 'origin/BaseBlep' into BranchBlep 2023-07-05 08:42:57 -04:00
Fluff
2f51287f62 Fixing stuff
title
2023-07-05 08:42:46 -04:00
FluffMedic
969f4ca7cc Merge branch 'master' into BaseBlep 2023-07-05 07:59:44 -04:00
Raeschen
b897db343a Merge pull request #6495 from FluffMedic/ValleyGrowth
Rebalancing spiders again
2023-07-05 12:29:54 +02:00
Raeschen
cdf2e14f85 Merge pull request #6486 from VictorZisthus/Sec-Logistics
Minor Security Supply Tweak
2023-07-05 12:29:17 +02:00
Raeschen
a830bfcc4c fix oversight with hard feet trait 2023-07-04 22:56:14 +02:00
Fluff
df938de65e Rebalancing spiders again
Making the spider event actually varied with it's spawns, while toning it down a bit, while also fixing my typos and dumb mistakes when adjusting spiders the first time.
2023-07-03 09:41:40 -04:00
Victor Zisthus
a3d9fc7d54 Minor Security Supply Tweak
Fixes the Warden starting off with the wrong Mask Hailer.

Gives regular officers mask hailers.

Allows emagged consoles to order ERT armor.
2023-07-01 21:55:54 -04:00
Fluff
451fb0b9a6 Adjusting the APH
Title
2023-06-30 08:25:11 -04:00
Fluff
a8a32f7651 Shrinking and adjustments to mob Ai
Title
2023-06-27 17:39:30 -04:00
Fluff
2531918026 Typo fixes
Thank you to the person who point them out, I forgot what you are on github but should be above this commit.
2023-06-26 12:57:37 -04:00
Fluff
df2dc4aef8 Trying to shrink but add more to MoL.
Also there is a new guest, and more hidden surprised throughout.
2023-06-25 11:43:57 -04:00
Fluff
8ecc7301a5 More map adjustments and scraping of things
Scraping the scrap faction mostly
2023-06-25 09:28:38 -04:00
Raeschen
6fdf1ca310 Merge pull request #6450 from FluffMedic/Coin
Adding belly sprites to the Rift Magnus
2023-06-25 12:48:40 +02:00
Fluff
e07a2a5a7e Adding info
Name
2023-06-24 15:14:28 -04:00
Razgriz
4aaf01a5bb Merge pull request #5714 from Cyrelius/Weapons/Armour
Energy Weapons Balance Pass.
2023-06-23 23:44:04 -07:00
Fluff
5b44857fad let the jank begin
Title
2023-06-23 17:00:19 -04:00
Fluff
b7202ae33e Adding belly sprites to the Rift Magnus
Title
2023-06-23 16:51:16 -04:00
Fluff
92d36874b3 Fixing Ashy and testing out traps
Title
2023-06-23 16:06:24 -04:00
Fluff
ab10d07106 Hrrmmm
Adjusted things
2023-06-23 15:39:15 -04:00
FluffMedic
95f09e3a68 Merge branch 'CHOMPStation2:master' into BaseBlep 2023-06-23 09:03:13 -04:00
purplefoxy27
9fc46609d8 Tweak inshoe steppies 2023-06-22 22:53:06 -07:00
Fluff
047d23bf95 More balance fixes
Weh
2023-06-22 10:03:13 -04:00
Fluff
a08742bb30 Make it so the SB can use it's special attacks
title
2023-06-22 09:44:56 -04:00
Fluff
abd94bfda9 Fixing turfs and typos
Fixed some typos, turfs, and tried to make the staffs feel a tad better without making the foes to strong.
2023-06-22 09:16:25 -04:00
Selis
32e938d2de Makes ticket stuff less overprotective 2023-06-21 23:36:12 +02:00
Fluff
b801f6d846 Balancing Changes
-Make the Super Boss function
-Lowered candy mob delay and added bellies I think
-Made MoL prettier
2023-06-21 16:32:34 -04:00
Selis
8f1f1f6d58 Feedback & Little Fixes 2023-06-21 13:55:44 +02:00
Selis
67ba4a2de5 Tickets System 2023-06-21 13:51:32 +02:00
Raeschen
ef98e7f4ea Fix a few chomp-specific typepaths and a marge conflict 2023-06-21 08:26:10 +02:00
Fluff
1c1b33812f AGGG typos
Typos are my bane
2023-06-20 15:56:47 -04:00
Fluff
29db70d4bc Merge remote-tracking branch 'origin/craft' into craft 2023-06-20 15:54:51 -04:00
Fluff
66d7556034 Fixing a typo
Title
2023-06-20 15:54:39 -04:00
Fluff
fabbfe36bc Making things pretty
Made more things look nicer, and adjusted some mob stats
2023-06-20 15:50:50 -04:00
FluffMedic
2a43353d18 Merge branch 'master' into craft 2023-06-20 15:26:56 -04:00
Fluff
f4987062af Adding names to areas, and adjusting armor
Title
2023-06-20 11:02:56 -04:00
Fluff
53aba35b4a Making things look nicer, and fixing visuals
Title
2023-06-19 11:10:45 -04:00
Raeschen
6bd26e380d Merge pull request #6265 from purplefoxy27/in-shoe-steppies
Add inshoe steppies
2023-06-19 09:08:59 +02:00
Raeschen
1cffb3f0e7 Merge pull request #6368 from Rykka-Stormheart/shep-dev-more-sounds
Sound Additions + Tweaks
2023-06-18 16:27:37 +02:00
Raeschen
d31adddf26 Merge pull request #6390 from TheGreatKitsune/vox-fixies
Fix Vox Alternate Eyes and add Vox Underbeak
2023-06-18 15:14:23 +02:00
Fluff
132c301e1a Merge remote-tracking branch 'origin/BaseBlep' into BranchBlep 2023-06-17 11:12:01 -04:00