cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
77,732 Commits 8 Branches 0 Tags
5b51a657d42228f559d974c8fc20b0ee18c6456d
Commit Graph

179 Commits

Author SHA1 Message Date
Guti
1bce7a45ce Meatyores (#7475) 2023-12-29 19:52:25 -05:00
TheGreatKitsune
9f22a3bcd2 Add a thing for event. (#7463) 2023-12-21 23:02:57 -05:00
Kashargul
a1da8c5e00 self recolour for simple mob / robot (#7415) 2023-12-16 21:14:48 +01:00
BlackMajor
92c744dfec Event stuff, but also Squeak component (#7285) 2023-12-11 14:40:47 +13:00
Kashargul
e87a358334 allows mimics to spawn again, fixes mob_spawner runtime (#7334) 2023-12-06 21:27:21 +01:00
Guti
b0691dd670 Mail goodies changes (#7337) 2023-12-06 21:11:03 +01:00
Verkister
301dff573a Slightly buffs flushies. (#7279) 2023-11-26 21:11:24 +01:00
Selis
2ba38d60af [MIRROR-FIX] Upstream merge 15464 (#7176) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
 2023-11-07 13:33:44 +01:00
Verkister
da219bad86 Adds more autotransfer filters, ore "recycling", and item digestability toggle. (#7102) 2023-10-26 12:45:57 -04:00
Verkister
7faa00efd2 Lets people borrow Swoopie's neck tube. (#7131) 2023-10-25 19:47:13 -04:00
Guti
0deb514fcb Mail fixes (#7105) 2023-10-24 20:59:10 -04:00
Guti
2044dd9fda Mail fixes, loot table updates and less junk mail (#7059) 2023-10-12 15:55:43 -04:00
FluffMedic
d7a4de741c Some Minor Changes (#7071) 2023-10-04 18:33:23 -04:00
Verkister
7bb5e41029 Small toilet fix and funny feature. (#7070) 2023-10-04 18:31:32 -04:00
Guti
5cfed43f74 CentComm Mail (#7024) 2023-09-26 15:46:46 +02:00
FluffMedic
680f9ab3a2 WierdChemAdjustments (#6990) 2023-09-18 17:47:29 +02:00
Verkister
e2db548b9b A couple toilet tweaks and fixes (#6983) 2023-09-18 17:43:20 +02:00
TheGreatKitsune
ce3893b002 Add on duty signs to Chem and Robotics (#6977) 2023-09-18 17:10:49 +02:00
tacoguy7765093
12c19d195c VR Pods spawn you with loadout items now (#6976) 2023-09-12 23:21:47 +02:00
tacoguy7765093
a8ba92c36d Enables the right file for VR pods (#6964) 2023-09-11 15:05:50 -04:00
Nadyr
151566bb3c [DNM] Tweaks whitelist code (#6677) 2023-09-05 21:09:41 +02:00
Verkister
acc55ec478 Implements BS recycling for the BS compostor (#6925) 2023-09-05 21:07:27 +02:00
Seris02
592abf29aa adds user_vars_to_edit (for events and stuff or just fun) (#6758) 2023-08-10 14:33:59 +02:00
BlackMajor
8c9bb95c17 Duffle/standard storage/weight alternatives for taur backpacks (#6746) 2023-08-07 14:48:05 +02:00
BlackMajor
65a031eb21 Last of the RCD fixes I swear (#6744) 2023-08-07 14:41:49 +02:00
BlackMajor
71c9c94757 Quick RCD fixes (#6742) 2023-08-07 07:51:58 +02:00
BlackMajor
7fd1ff3dc5 RCD Improvements + Holofans + fixes (#6738) 2023-08-06 17:07:59 +02:00
Nadyr
82e0256d3e Capture crystal vore VFX and vore helper procs (#6632) 2023-07-23 00:23:26 +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
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
Aroliacue
9468bb5f7a Bridge Officer 2023-07-17 15:43:49 +10: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
FluffMedic
32b912469d Merge branch 'CHOMPStation2:master' into craft 2023-07-11 13:49:26 -04: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
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
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
FluffMedic
2a43353d18 Merge branch 'master' into craft 2023-06-20 15:26:56 -04: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
Fluff
d99e728bbb Chemistry Update 
Alright added more chems and stuff for explorery and minery folks to bring back to station
 2023-06-08 17:07:52 -04:00
Darlantan
ac96197d7f VR code tweaks, mob TF, ghost joining, qdel to VR escapees 2023-05-24 08:42:09 -04:00
BlackMajor
fd1714cae9 Update vacpack.dm 2023-05-12 21:53:34 +12:00
Verkister
01d895fb34 B 2023-05-11 21:52:15 +03:00