Commit Graph

116 Commits

Author SHA1 Message Date
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
Fluff
e56e641d08 fixing Coloration 2023-07-17 23:04:52 -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
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
BlackMajor
fd1714cae9 Update vacpack.dm 2023-05-12 21:53:34 +12:00
Verkister
01d895fb34 B 2023-05-11 21:52:15 +03:00
Verkister
9cb7a29b23 more fixies
Fixes vorgan vac destination not checking if vorgan owner is present or adjacent.
Fixes massive piles bypassing any capacity checks on trashbag mode.
2023-05-11 21:47:38 +03:00
Verkister
ff327a5a3d Adds auto-setting for vacpack 2023-05-11 17:40:32 +03:00
Verkister
92b321b906 A couple vacpack and vorgan juice fixes
Vacpack now checks for spont prey pref.
Fixed vacpack direct targeted sucks missing their after-click doublechecks. (the cancel stuff for fleeing distance and things leaving/yoinked from the tile)
Fixed liquidbelly acid item interaction order (now does digest_act stuff first if in belly)
Fixed open containers eating up all liquids.
2023-05-11 15:49:49 +03:00
Verkister
e5efd91b13 one last minute oversight fix
no succy on buckled mobs
2023-05-08 02:44:41 +03:00
Verkister
86d3a44eb0 forgot the files lmao 2023-05-07 20:02:13 +03:00
BlackMajor
e3c6d74ffd Done and dusted 2023-04-30 15:49:35 +12:00
Nadyr
fb6f726187 Merge pull request #6074 from Sharkmare/Flipper
Codename Flipper
2023-04-25 20:33:45 -04:00
LukasJuergens
0efee21dc6 Add the new capture crystal to the "Bits and Bobs" vendor.
Also fixed a typo in the crystals description.
2023-04-14 18:35:54 +02:00
Sharkmare
0a91f3a1f3 Codename Flipper
Illegal PAI system Vix

Personal Assistant, Hacking Multitool, all in one companion for penetration testing
2023-04-11 11:12:04 +02:00
Nadyr
45e1fbd0c5 Merge pull request #5924 from TheGreatKitsune/loadout-crystals
Adds loadout capture crystals!
2023-04-10 17:13:47 -04:00
Verkister
b92fb9222a Fixes a funny gargoyle feeding bug
Fixes borgo tongues giving feedable gargoyles a little bit too deep cleansing.
2023-04-03 15:31:54 +03:00
Nadyr
dd5030f0dc Merge pull request #6017 from Verkister/patch-39
Unhardens flush message code
2023-04-02 19:31:07 -04:00
Verkister
1637bb6527 Unhardens flush message code
Makes it possible to varedit utilize a toilet into a non-toilet use without awkwardly revealing messages.
2023-04-02 16:15:55 +03:00
TheGreatKitsune
99d9295bc3 Merge master into loadout-crystals 2023-04-01 08:56:27 -05:00
Verkister
c15e184956 wrenk 2023-04-01 14:53:05 +03:00
Verkister
1af250adca Feedable gargoyles
Petrified players can now be fed with grabbed or thrown mobs, and also thrown or held trasheatable items if their trash catching mode is enabled.
2023-04-01 14:15:08 +03:00
Seris02
abc62d2d89 petrification interface 2023-03-23 16:43:42 +08:00
Nadyr
8a1c1b2243 Merge pull request #5967 from Seris02/gargoyleefficiency
better gargoyle code
2023-03-19 08:50:15 -04:00
Seris02
fb677ceee1 better gargoyle code 2023-03-18 19:56:35 +08:00
TheGreatKitsune
97701e8b3f Adds loadout capture crystals! 2023-03-13 16:58:03 -05:00
LukasJuergens
a52ecf2637 New capture crystal type
Adds a new (cheap) capture crystal that only works on crew, not animals or carbon mobs with no client.
2023-03-13 22:07:59 +01:00
Sharkmare
5eec328c8c Recolorable Petrification code 2023-03-08 22:04:47 +01:00
Sharkmare
4a2b06e0cf Gargoyle Custimization round 1
"statue of name" now allows to change the statue part
"your skin hardens" now allows to change the hardens part
"you  turn to stone" now allows to change the stone part

"your skin softens" modified to "your skin reverts" so we dont need a negative adjective
2023-03-08 17:38:36 +01:00
TheGreatKitsune
1d36a4215d Item TF spawnpoints 2023-02-26 15:43:47 -06:00
BlackMajor
7f52a2318b Merge pull request #5727 from Seris02/radiohelping
stops radios from dropping out every second message
2023-02-23 14:42:15 +13:00
Seris02
a3c97cf926 makes a couple Entered() procs call parent as well - bellies + disposals 2023-02-18 11:47:27 +08:00
Seris02
d4cb44c6a6 better gargoyle 2023-02-16 20:01:37 +08:00
Seris02
f4d900475d normal examine message 2023-02-16 15:05:33 +08:00
Seris02
2cbc17f720 Merge branch 'master' of https://github.com/CHOMPStation2/CHOMPStation2 into gargoyle 2023-02-16 12:16:57 +08:00