Commit Graph

641 Commits

Author SHA1 Message Date
Aroliacue
9468bb5f7a Bridge Officer 2023-07-17 15:43:49 +10:00
Raeschen
fcdf73051d Merge pull request #6563 from kcin2001/borg-stuff
Miscellaneous Dogborg Tweaks/Fixes
2023-07-14 23:52:32 +02:00
Raeschen
7580dae85a Merge pull request #6559 from CHOMPStation2/Raeschen-patch-1
Remove snark from a tip
2023-07-14 07:55:17 +02:00
Raeschen
a806e9aad7 Merge pull request #6395 from FluffMedic/BaseBlep
Base blep
2023-07-13 16:07:11 +02:00
FluffMedic
9979255e1a Apply suggestions from code review
Thank you Rae

Co-authored-by: Raeschen <rycoop29@gmail.com>
2023-07-13 09:41:30 -04:00
Fluff
7ba887d3df experimental typos
Weh
2023-07-13 08:41:58 -04:00
FluffMedic
638aedaf1d Apply suggestions from code review
Thank you Raeschen

Co-authored-by: Raeschen <rycoop29@gmail.com>
2023-07-13 08:16:15 -04:00
Fluff
bf839969f4 Fully fixes the medkit this time?
Title
2023-07-12 18:02:39 -04:00
Fluff
194cd0b05e Fixing the first aid kit
Title
2023-07-12 17:56:22 -04:00
Fluff
f671d4e564 More typos
I need a spell checker for my code.
2023-07-12 17:25:37 -04:00
Fluff
ca9520c58d Merge remote-tracking branch 'origin/craft' into craft 2023-07-12 16:38:52 -04:00
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
01d73d5d07 Merge pull request #6496 from FoxglovePurpur/purdev-sm-z-2
SM Lighter Rework, Loadout Addition, and Experimental Lighter
2023-07-05 18:34:57 +02:00
Digi Purpur
0985e7c7f8 Added Summary Comments
- Hardlight Supermatter Zippo is the safest SM Zippo. If you "fumble" it, you get a tiny shock and that's basically it.
- Phoron Supermatter Zippo is safe for station use but its effects are worse, at least on the pain side of things as fumbling it can cause a stun and if you have low health already can crit you. Though neither should really be capable of killing, just like the base cheap lighters. These are just "a tiny bit more dangerous".

- The EXPERIMENTAL SM LIGHTER is ADMIN ONLY (for use in events and special POIs atm only)
> You have a 22/100 change to use it safely. All effects give a small amount of radiation (1 irradiate, it's literally nothing and goes away basically instantly). 
> You have a 1/10 chance to burn and shock yourself.
> You have a 1/10 chance to major burn yourself.
> You have a 1/10 chance to emag/EMP yourself.
> You have a 1/10 chance to dust your hand.
> You have a 1/10 chance to burn and tox yourself, as well as putting yourself in a fake crit state due to pain and stutter procs.
> You have a 1/10 chance to pinch yourself, dealing a "pain" damage of, basically nothing. But this does do one point of genetic damage. Again, shouldn't really do anything.
You have a 1/10 chance to look at the supermatter, causing you go to weak, get put into a blind state for a second. Nothing actually lethal though, and you'll get up soon after. (I also had to fix an issue, I accidentally typed 505 agony, not 50 agony, at least when you're holding it in y our left hand. Oops.
> Finally,  you have a 1/100 chance to heavily irradiate the area you're in and insta dust yourself, just as if you touched the station's supermatter crystal.
2023-07-05 09:20:26 -07: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
Purdev
6e45df98a0 Update cigs_lighters.dm
- Adding a closing tag that I had forgotten.
2023-07-03 07:57:39 -07:00
Digi Purpur
33394d6d07 Supermatter Lighters balanced, and added fully. <3
ALL experimental features for /selfattack added. (Procs on opening the lighter).
It'll be turned into a WMD eventually <3
2023-07-03 07:32:01 -07: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
5ce5cba5d7 Removed the "ERT" stuff
Just looking to get this merged ASAP.
2023-07-02 18:55:15 -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