cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-28 02:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
76,646 Commits 8 Branches 0 Tags
b081b209aeaeb33bcae9a01b52a7a16a40ead2bb
Commit Graph

4093 Commits

Author SHA1 Message Date
BlackMajor
92c744dfec Event stuff, but also Squeak component (#7285) 2023-12-11 14:40:47 +13:00
CHOMPStation2
c8907b61bf [MIRROR] Makes gift wrap display its warnings better (#7385) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-12-10 00:34:02 +01:00
CHOMPStation2
3d5b378a12 [MIRROR] jawsoflife missed the pry to open firedoors. (#7373) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-12-09 12:40:57 +01:00
Aroliacue
8dc3f411a2 Xenomorph Structure Icon Update + Misc Fixes/Improvements (#7336) 2023-12-06 21:31:18 +01:00
CHOMPStation2
bec46d23b9 [MIRROR] Protean Reconstitutor (#7320) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-12-03 13:20:23 +01:00
FluffMedic
08e7b6658b 1 real fix, two bandaid ones. (#7270) 2023-11-25 13:53:46 +01:00
Aroliacue
3117d9a8c9 Inventory Depth 2 (#7191) 2023-11-08 08:23:38 +01:00
Selis
aae9676187 [MIRROR-FIX] Upstream merge 15493 (#7178) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
 2023-11-07 13:34:51 +01:00
CHOMPStation2
daa6d0a5b5 [MIRROR] Fixes some syndie borg items (#7165) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-11-05 02:26:51 -05:00
CHOMPStation2
3663946898 [MIRROR] Altevian Adjustments - Descriptions & Small Tweaks (#7072) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
 2023-10-04 18:58:54 -04:00
CHOMPStation2
c5d8cbb246 [MIRROR] Fixes belts and pouches not being able to hold power tools (#7065) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-10-04 18:57:35 -04:00
CHOMPStation2
d2e66e6410 [MIRROR] Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one (#7062) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
 2023-10-04 18:37:41 -04:00
CHOMPStation2
507879aef8 [MIRROR] Fantasy redgate map (#7035) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-09-26 16:29:35 +02:00
CHOMPStation2
d89c3dba7c [MIRROR] Locks & Keys (#7018) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-09-21 10:54:54 +02:00
CHOMPStation2
58891b3e78 [MIRROR] Changes blood regen pill instances to contain copper pills due to zorren copper update (#6958) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
 2023-09-12 23:19:36 +02:00
Verkister
fdd124ff20 Adds fibers to clothing and bags/boxes/etc. (#6912) 2023-09-03 17:52:30 +02:00
CHOMPStation2
afe5239781 [MIRROR] Adds Entrepreneur job, as well as new Entertainer alt-title (#6898) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-09-01 10:18:27 +02:00
CHOMPStation2
e057d82781 [MIRROR] Removes random burn chance from cheap lighters (#6890) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-08-31 10:46:57 +02:00
Seris02
6e75622dde fixes container open sounds (#6883) 2023-08-29 17:30:48 +02:00
CHOMPStation2
9d2f15e494 [MIRROR] Adds food vore (#6858) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-08-23 15:13:38 +02:00
CHOMPStation2
c15451f51f [MIRROR] Revise OOC notes panel (#6831) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-08-18 09:42:55 +02:00
CHOMPStation2
fb8b6c1de9 [MIRROR] Updates SM manual (#6771) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-08-14 08:05:17 +02:00
CHOMPStation2
51b73e8042 [MIRROR] [READY] Removes Dogborgs (#6763) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
Co-authored-by: kcin2001 <rnlb2001@gmail.com>
 2023-08-14 08:01:48 +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
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
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
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
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
Heroman3003
e62d81af4b [MIRROR] the little construction pr 2023-07-07 07:30:36 +00:00
Raeschen
2c9b7b1a59 mass renaming everything is a good thing right??? 2023-07-05 10:33:37 +02:00
Casey
19550009ce Tweaks and tidying 2023-07-03 10:24:10 +00:00
Raeschen
ef98e7f4ea Fix a few chomp-specific typepaths and a marge conflict 2023-06-21 08:26:10 +02:00
Raeschen
9ae31e501e Merge pull request #6411 from CHOMPStation2/upstream-merge-15043 
[MIRROR] Spell Fixes
 2023-06-19 12:42:37 +02:00
Heroman3003
db38ed93c0 Spell Fixes 2023-06-19 04:40:45 +00:00
Heroman3003
e5bb9e586e Merge pull request #15040 from Youtubeboy139/Belts-And-Stuff 
New Belts and Accessories
 2023-06-18 18:42:07 +00:00
Raeschen
1f99e6ce53 Merge pull request #6329 from CHOMPStation2/upstream-merge-14976 
[MIRROR] More 515 Compatibility
 2023-06-18 14:59:19 +02:00
Raeschen
3a8f28c2c5 Merge pull request #6351 from CHOMPStation2/upstream-merge-14961 
[MIRROR] "Hey bud, need a light?"
 2023-06-17 23:09:05 +02:00
Raeschen
30f2a668f4 Merge pull request #6337 from CHOMPStation2/upstream-merge-14988 
[MIRROR] Fixes oversight of picnic blankets NOT being anchored
 2023-06-17 22:53:58 +02:00
Raeschen
7c5f1f6049 Merge pull request #6314 from CHOMPStation2/upstream-merge-14957 
[MIRROR] Fixes #14956
 2023-06-17 15:12:04 +02:00
Raeschen
2c3eefe326 Merge branch 'master' into upstream-merge-14976 2023-06-17 14:47:37 +02:00
Nadyr
81b3ccb3a0 Merge pull request #6304 from CHOMPStation2/upstream-merge-14936 
[MIRROR] Little Weakref Refactor
 2023-06-09 22:27:56 -04:00