cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
76,967 Commits 10 Branches 0 Tags
e9effb63f508f491d97bf4e34b7a6ff89822fdbd
Commit Graph

858 Commits

Author SHA1 Message Date
kcin2001
7045e3c99b wrong sprite list commented out (#6648) 2023-07-24 10:02:14 +02:00
kcin2001
9fd40fd818 fix reset module breaking and broken med sprites (#6643) 2023-07-23 08:43:48 +02:00
Nadyr
82e0256d3e Capture crystal vore VFX and vore helper procs (#6632) 2023-07-23 00:23:26 +02:00
kcin2001
6b5b341a49 oversights with borg sprite refactor (#6638) 2023-07-22 08:27:38 +02:00
kcin2001
d80cd972d9 Borg sprite refactor (#6627) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
Co-authored-by: Raeschen <Raeschen@users.noreply.github.com>
Co-authored-by: FluffMedic <109300046+FluffMedic@users.noreply.github.com>
Co-authored-by: Victor Zisthus <56660717+VictorZisthus@users.noreply.github.com>
Co-authored-by: Razgriz1032 <Razgriz1032@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <58959929+CHOMPStation2@users.noreply.github.com>
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: purplefoxy27 <38367315+purplefoxy27@users.noreply.github.com>
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Aroliacue <96730930+Aroliacue@users.noreply.github.com>
 2023-07-21 10:18:20 +02:00
Raeschen
071905fed5 Fix lost changes (#6633) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Raeschen <Raeschen@users.noreply.github.com>
Co-authored-by: FluffMedic <109300046+FluffMedic@users.noreply.github.com>
Co-authored-by: Victor Zisthus <56660717+VictorZisthus@users.noreply.github.com>
Co-authored-by: Razgriz1032 <Razgriz1032@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <58959929+CHOMPStation2@users.noreply.github.com>
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: purplefoxy27 <38367315+purplefoxy27@users.noreply.github.com>
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Aroliacue <96730930+Aroliacue@users.noreply.github.com>
 2023-07-21 08:44:40 +02:00
Razgriz
66ce5daf87 Revert "Capture crystal VFX and vore procs" 
This reverts commit 570ba65320.
 2023-07-20 20:35:25 -07:00
Darlantan
570ba65320 Capture crystal VFX and vore procs 2023-07-20 23:22:41 -04:00
Scarlet-Oduko
fe2654a5c7 purity constructs/mechanical followers - new cult faction (#6586) 2023-07-18 19:59:12 +02:00
Raeschen
ff60c17db9 Merge pull request #6605 from FluffMedic/craft 
fixing Coloration
 2023-07-18 08:05:14 +02:00
Fluff
e56e641d08 fixing Coloration 2023-07-17 23:04:52 -04:00
Raeschen
d0cdfdfced Merge pull request #6593 from Aroliacue/aro_bridgeofficer 
Secretary Alt-Title: Bridge Officer
 2023-07-17 23:21:46 +02:00
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
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