Commit Graph

611 Commits

Author SHA1 Message Date
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
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
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
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
Raeschen
6fdf1ca310 Merge pull request #6450 from FluffMedic/Coin
Adding belly sprites to the Rift Magnus
2023-06-25 12:48:40 +02: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
purplefoxy27
9fc46609d8 Tweak inshoe steppies 2023-06-22 22:53:06 -07:00
Selis
32e938d2de Makes ticket stuff less overprotective 2023-06-21 23:36:12 +02: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
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
FluffMedic
2a43353d18 Merge branch 'master' into craft 2023-06-20 15:26:56 -04:00
Raeschen
6948fc7acb Merge pull request #6389 from FoxglovePurpur/purdev-supermatter_zippo
Supermatter Zippo Lighters
2023-06-19 11:08:25 +02: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
Rykka Stormheart
45198d7bc7 Removes Stunned Loop 2023-06-17 06:28:07 -07:00
Rykka Stormheart
768d250350 Fixes Simplemob Slowdown for CHOMPStation
Also fixes Promethean blob movement, finally.
2023-06-17 06:04:09 -07:00
TheGreatKitsune
649de86cbe Fix Vox Alternate Eyes and add Vox Underbeak 2023-06-16 19:44:00 -05:00
Digi Purpur
342a1bac19 Fixed probability of misuse.
Using the lighter incorrectly is now (1/2)(5%) and (1/2)(1%) rather than the demo probability of 25% each.
2023-06-16 14:51:47 -07:00
Digi Purpur
bb2be4cf33 Adds "Supermatter" Zippo Lighters
*SUPERMATTER DETECTED ON STATION*
2023-06-16 14:47:13 -07:00
Rykka Stormheart
1de51fb4b8 Sound Additions + Tweaks
Changes listed below:
* Makes Death Sounds mutable on their own audio channel.
* Makes Ear Ringing use the HUD Channel for sounds

Additions:
* [Adds On Fire effect](https://streamable.com/c1fxeo)
* Adds Stunned effect(https://streamable.com/v2if0s)
* [Adds SMES humming based on power usage in/out. Affected by walls, will only play if in LOS and visible.](https://streamable.com/z41x90)
* [Adds Atmos Alerts making a noise on the monitor](https://streamable.com/uhegq6)
* [Tcomms + PDA servers hum when powered and active, also respects walls/LOS](https://streamable.com/vb08x1)
* [Fridges hum quietly while powered](https://streamable.com/c3zsz7)
* [Point Defense turrets now make a sound audible from inside the station when firing, to add more spice to meteor waves.](https://streamable.com/bf8mwl)
* Shield Generators now hum when active.
2023-06-15 12:27:23 -07:00
Digi Purpur
3468c70ebf Foxtaur Squats
GET THAT WORKOUT IN BB
2023-06-13 12:21:02 -07:00
Kassc
426f253fae Merge pull request #6237 from FluffMedic/AlienCritterRebranding
Alien critter rebranding
2023-06-12 12:14:40 -04:00
Fluff
49c8a1a925 Copying and pasting a define
Github is screaming at something not being defined in the proper file
2023-06-12 09:03:11 -04:00
Nadyr
5aa4bab24a Merge pull request #6296 from FluffMedic/Mistakes
Trying to make amends.
2023-06-09 21:32:50 -04:00
Nadyr
c9055c240b Merge pull request #6282 from FluffMedic/Xenoarch
Fixing a typo
2023-06-09 21:20:05 -04:00
Fluff
6206b3517f Fixing things
Fixing things
2023-06-09 08:31:31 -04:00