cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-02-02 04:31:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
76,027 Commits 11 Branches 0 Tags
71c9c94757e976d911dfd855d9d640e5f4e7d50f
Commit Graph

10773 Commits

Author SHA1 Message Date
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
CHOMPStation2
04857c569e [MIRROR] hotsprings (#6727) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-08-06 01:05:36 +02:00
CHOMPStation2
462db08fff [MIRROR] Stardog (#6718) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-08-06 00:24:31 +02:00
Raeschen
eec88f449a Update tank_types_vr.dm - runtime (#6703) 2023-08-01 17:51:42 +02:00
CHOMPStation2
4d062e3139 [MIRROR] Staves Mini-Tweak (#6688) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-07-31 08:49:23 +02:00
CHOMPStation2
c3d1fd6128 [MIRROR] Staves (#6684) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-07-30 16:16:00 +02:00
CHOMPStation2
c25cb2e25d [MIRROR] Adds(feature): Triggerable Landmarks for Event-help (#6675) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-07-30 08:24:23 +02:00
Verkister
dcb169f1d3 New grille sprites (#6655) 2023-07-27 07:54:07 +02:00
Nadyr
82e0256d3e Capture crystal vore VFX and vore helper procs (#6632) 2023-07-23 00:23:26 +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
Heroman3003
b706cd1565 Fixes PDA records missing linebreaks & fixes communicator weather app gibberish 2023-07-18 05:13:16 +00:00
Razgriz
d46d68a867 Merge pull request #6587 from VictorZisthus/emergency-closet-fix 
Brief Locker overhaul
 2023-07-15 19:40:56 -07:00
Victor Zisthus
2ca59be725 Brief Locker overhaul 
Emergency lockers and secure lockers now start anchored to the ground. If you want to move them, you'd better have access and a wrench.

Adjusted emergency lockers to have suit cooling units, and fixes the missing first aid kit in the 25% chance Aid roll.
 2023-07-15 20:51:16 -04:00
Raeschen
b9daf93a9c Update boxes_vr.dm 2023-07-15 23:48:23 +02:00
Heroman3003
33775c7843 Adds altevian NPCs for event use 2023-07-15 20:05:51 +00:00
Raeschen
2a4d78bb47 Merge pull request #6342 from FluffMedic/craft 
Chemistry Update
 2023-07-13 14:58:30 +02:00
Raeschen
cea0f8df9c Merge pull request #6561 from Aroliacue/aro_medguide 
Makes Health Scanner Medguide Available to Everyone
 2023-07-12 08:18:33 +02:00
Aroliacue
0ce36e2954 Guide for everyone 2023-07-12 11:05:12 +10:00
Aroliacue
31bb617dc9 P90K Revamp 2023-07-12 07:39:22 +10:00
FluffMedic
32b912469d Merge branch 'CHOMPStation2:master' into craft 2023-07-11 13:49:26 -04:00
Raeschen
990b49d31b Merge pull request #6534 from FoxglovePurpur/purdev-air_tanks 
Air Tank Changes
 2023-07-10 08:51:05 +02:00
Digi Purpur
869925562d Thank you Bib <3 
Bib brought up that the text shows
> That's Corrupted size gun.
when it should show
> That's a corrupted size gun.
So I fixed. :)
 2023-07-08 21:17:25 -07:00
Purdev
dd355fea3d Adds CHOMP Comments to tank_types.dm 
Adds missing comments.
 2023-07-08 11:59:13 -07:00
Digi Purpur
900b4995a3 Fixing tank_types.dm 
This is mostly just in case tank_types_vr.dm missed something and in testing nothing went wrong with editing this to match the _vr version? Oh and also this DOES add unique sprites to certain things. So changing a couple small lines here n' there are important. (Basically sprite related changes here are required, volume and such idk)
 2023-07-08 10:24:41 -07:00
Digi Purpur
81d43e20ef Small Changes to Air Tanks 
Changes the sprite for "double_nitrogen" from double phoron (why did it share the sprite?) to it's own sprite.
Makes double tanks properly doubled by ensuring they're *double* extended tanks. (normal emergency tanks have 2, extended have 6, double had 10, now 12.
 2023-07-08 10:23:21 -07:00
Raeschen
143a5486fa Update tile_types.dm 2023-07-07 09:53:38 +02:00
Raeschen
a7c603e2a6 Update window.dm 2023-07-07 09:51:15 +02:00
Raeschen
083cf18632 Update tile_types.dm 2023-07-07 09:49:15 +02:00
Heroman3003
e62d81af4b [MIRROR] the little construction pr 2023-07-07 07:30:36 +00:00
Heroman3003
d2e70f0d95 Merge pull request #15115 from PastelPrinceDan/typofix 
fixes a few typos
 2023-07-06 21:52:26 +00:00
Raeschen
a77566d2fa Merge pull request #6505 from CHOMPStation2/upstream-merge-15112 
[MIRROR] Adds new Debris Field POI: Phoron Tanker!
 2023-07-06 23:06:05 +02:00
Raeschen
87270d2f83 Update poi_items.dm 2023-07-06 22:49:28 +02:00
Razgriz
ffaaf30cdd accurate comments that make you say yes 2023-07-06 03:09:54 -07:00
Razgriz
f589c2c704 comments that make you say yes 2023-07-06 03:09:27 -07:00
Razgriz
6e2958a855 fixes that make you say yes 2023-07-06 02:58:30 -07:00
Razgriz
294801f20b powder that makes you say yes 2023-07-05 23:28:45 -07:00
Casey
568d1fed14 Adds new Debris Field POI: Phoron Tanker! 2023-07-05 22:28:58 +00:00
Casey
f62a1c4300 Health Analyzer post-guidance improvements 2023-07-05 22:26:47 +00:00
Raeschen
a670e75b5d Merge branch 'master' into upstream-merge-15110 2023-07-05 12:43:07 +02:00
Raeschen
2f18685407 Merge pull request #6500 from CHOMPStation2/upstream-merge-15109 
[MIRROR] Medical Guidance
 2023-07-05 12:42:18 +02:00
Raeschen
952157d4a0 Update health.dm merge conflict 2023-07-05 12:34:48 +02:00
Raeschen
a21010de21 more missed names 2023-07-05 10:43:54 +02:00
Raeschen
23714a7b86 more chomp-specific name changes 2023-07-05 10:36:41 +02:00
Raeschen
2c9b7b1a59 mass renaming everything is a good thing right??? 2023-07-05 10:33:37 +02:00
Raeschen
1e2deb86ed missing comma 2023-07-05 10:21:45 +02:00
Raeschen
740a877f89 readd some chompedited stuff 2023-07-05 10:18:45 +02:00
Raeschen
0e680b38a5 missed conflict 2023-07-05 10:14:43 +02:00