Commit Graph

762 Commits

Author SHA1 Message Date
Selis
2dadfc3d68 _ch 2023-07-17 20:01:01 +02:00
Selis
77e57e7209 feat: Better changelogs 2023-07-17 18:54:57 +02:00
Rakkun
b186910ca0 Revert "Revert "New rings""
This reverts commit e10f2a1f99.
2023-07-17 06:30:29 -03:00
Rakkun
e10f2a1f99 Revert "New rings"
This reverts commit 99c538d471.
2023-07-17 06:21:50 -03:00
Rakkun
99c538d471 New rings
Added two new rings and included them in the loadout menu.
2023-07-17 06:15:16 -03:00
SarmentiCampbell
62a17be4f0 Fix Service TallBorg's Eyes 2023-07-16 08:20:01 +02:00
SarmentiCampbell
94666fc395 Merge branch 'master' into Sillicon 2023-07-15 11:23:33 +02:00
SarmentiCampbell
4290b35de6 there 2023-07-15 11:05:04 +02:00
SarmentiCampbell
81b6ef6d9a Tallborgs added 2023-07-15 10:25:44 +02:00
Raeschen
fcdf73051d Merge pull request #6563 from kcin2001/borg-stuff
Miscellaneous Dogborg Tweaks/Fixes
2023-07-14 23:52:32 +02:00
Raeschen
0efe34cd19 Merge pull request #6575 from Aroliacue/aro_firearms
C-20R Rework, New Wielded Gun Sprites
2023-07-14 12:18:30 +02:00
Raeschen
01f7b822e8 Merge pull request #6570 from CHOMPStation2/Raeschen-BanishActiveEdges
Active edge banishment
2023-07-14 12:14:41 +02:00
Raeschen
cfe9abc623 a bunch more active edges 2023-07-14 11:58:50 +02:00
Raeschen
f89ae1f7cc a few more 2023-07-14 10:16:08 +02:00
Raeschen
075ce37360 a few more 2023-07-14 10:05:41 +02:00
Aroliacue
690596cbf8 C-20R rework, new wielded gun sprites 2023-07-14 17:33:51 +10:00
Raeschen
588ef91cce more active edges 2023-07-14 09:32:40 +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
e652227e6c active edge banishment 2023-07-13 19:36:22 +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
Raeschen
2a4d78bb47 Merge pull request #6342 from FluffMedic/craft
Chemistry Update
2023-07-13 14:58:30 +02: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
Aroliacue
e737cb1fc5 Damage reduction, new sound effects 2023-07-12 10:15:40 +10: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
8170c84671 Update crashedexplo.dmm 2023-07-07 07:44:43 +02:00
Raeschen
78112865db Try fix another runtime 2023-07-07 07:28:38 +02:00
Razgriz
524d6fae45 Merge pull request #6516 from kcin2001/raptor-fixes
Raptorborg dmi tweaks
2023-07-06 12:52:20 -07:00
kcin2001
2ff2eaff38 Ragefixing the thicc machine 2023-07-06 10:34:57 -07:00
Raeschen
80e2f7e5c3 try make mapbot happy 2023-07-06 10:54:44 +02:00
Raeschen
4014820bff Modularise all our submaps 2023-07-06 10:31:18 +02:00
Razgriz
8265a303d1 Broodling spiderlings and eggs 2023-07-05 17:18:55 -07: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