cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-02 13:34:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
77,866 Commits 7 Branches 0 Tags
fe7e122a19ab06b43aa142cf6463c8c20bf304fe
Commit Graph

310 Commits

Author SHA1 Message Date
Cadyn
cf1db3c049 Memory tracking shenanigans (#8359) 2024-05-15 16:56:31 +02:00
Cadyn
ccad338c93 Tgpanel (#8007) 
Co-authored-by: ItsSelis <selis@xynolabs.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-03-24 12:19:07 +01:00
Cadyn
b90f7ec922 The 515 MegaPR early downport (#7783) 
Co-authored-by: Selis <selis@xynolabs.com>
Co-authored-by: Selis <sirlionfur@hotmail.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: SatinIsle <thesatinisle@gmail.com>
Co-authored-by: Heroman <alesha3000@list.ru>
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-27 20:17:32 +01:00
CHOMPStation2
eecf6bbff9 [MIRROR] Fluff item for grallstonefist (#7721) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-16 10:52:54 +01:00
Heroman3003
457961f3ca Merge pull request #15079 from Tenryumi/nikki-outfit-fix 
Fixes Nikki's fluff outfit uniform not rendering onmob sprites
 2023-06-26 10:40:16 +00:00
Casey
c0093930a5 Merge pull request #14857 from BonniePandora/CustomItem-NameChange 
Small custom-item changes
 2023-05-15 00:18:21 +00:00
Casey
790e2cbd81 Merge pull request #14772 from Runa-Dacino/mirafluff 
Adds Mira's health services medal
 2023-04-10 00:55:12 +00:00
Heroman3003
59819128b4 Adds loaded dice + a custom item 2023-01-22 01:36:16 +00:00
Casey
009d6604d0 Merge pull request #14083 from BonniePandora/Forb-Time 
Pandora's Fox-orb custom plush
 2022-11-17 02:31:44 +00:00
Novacat
9bfeba47bb Merge pull request #13973 from TheDavestDave/knight-fluff-fix 
fluff item spawns now
 2022-10-25 23:23:10 +00:00
Casey
604ff7c816 Merge pull request #13560 from faaaay/m41l-item 
adds a custom item for coolcrow420
 2022-08-25 22:55:29 +00:00
Casey
f43c530c46 Merge pull request #13287 from ZodiacShadow/Zodiac 
Nehi fluff items
 2022-07-08 00:36:49 +00:00
Casey
8a2511e1b3 Merge pull request #13012 from stobarico/master 
Stobarico's Fluff Item
 2022-05-29 17:43:59 +00:00
Casey
a318b9be4c Merge pull request #13004 from TheDavestDave/amor-stuffs 
custom item stuff ahead of explo removeal
 2022-05-22 18:32:21 +00:00
Nadyr
9cafbc8dd0 powder that makes you say yes 2022-05-12 19:40:22 -04:00
Casey
a3b274487f Adds Nettie's fluff Tablet 2022-05-12 19:42:57 +00:00
Casey
d552e834a1 The Grand /TG Port - Part 2 2022-04-03 03:27:36 +00:00
Nadyr
5680916f50 powder that makes you say yes 2022-02-19 20:50:48 -05:00
Casey
dc837b05b4 [ready] pastelprincedan plushie fluff item 2022-02-19 22:06:21 +00:00
Razgriz
c71e45a099 powder that makes you say yes 2022-02-17 17:32:50 -07:00
Casey
37e43bf832 revolver eloise fluff item 2022-02-17 13:16:50 +00:00
Nadyr
8818ecf87a powder that makes you say yes 2022-02-06 20:43:03 -05:00
Casey
9379f4d1bc makes amour for lucky 2022-02-06 14:18:49 +00:00
Razgriz
064f1b1a20 Merge branch 'master' into upstream-merge-11935 2021-12-10 01:48:12 -07:00
Razgriz
a4637d6c1a powder that makes you say whatever 2021-12-10 01:47:17 -07:00
Nadyr
7244680a29 powder that makes you say yes 2021-12-05 12:30:36 -05:00
Casey
6004382872 Custom item for Coolcrow420, minor change to stamp code 2021-12-04 01:28:37 +00:00
Aronai Sieyes
a0cd42922e Adds Amaryll's claws fluff item 2021-12-03 07:16:14 +00:00
Aronai Sieyes
0f2f5cb482 Merge pull request #11615 from VOREStation/upstream-merge-8311 
[MIRROR] Remove suicide act
 2021-10-28 00:49:05 +00:00
Chompstation Bot
481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Chompstation Bot
4476e4104d Ports Runechat 2021-05-30 22:51:20 +00:00
Chompstation Bot
588179bd66 Remove unnecessary 'signatures' 2021-04-08 16:48:30 +00:00
Chompstation Bot
149f222644 MORE ALT ID STUFF 2021-03-28 23:59:28 +00:00
Nadyr
702b023815 Update custom_items_vr.dm 2021-03-27 23:27:20 -04:00
Chompstation Bot
f825d5ca9f Fixes Fluff and ITG ID cards, refactors event/fluff IDs a lil', also fixes for digested id icons 2021-03-24 18:51:25 +00:00
Chompstation Bot
2a5c21c8f5 [MIRROR] Kaleidoscope 2: The Retabbening 2021-03-21 01:24:14 -04:00
Novacat
6b62269885 Merge pull request #9734 from MarinaGryphon/init_fixes 
Fixes init issues in _vr files.
 2021-02-16 17:59:00 +00:00
Razgriz
190d32ba25 Removal 2020-12-12 15:31:40 -07:00
Chompstation Bot
f7df37c72d Adds Verie's fluff items + framework for hair accessories 2020-12-11 12:13:12 +00:00
Novacat
a9f77823d7 Merge pull request #9333 from Tenryumi/nikki-fluff 
Adds Nikki's Fluff Outfit For Nikki, + Rigsuit-Mounted Size Guns For Research
 2020-11-30 23:46:15 +00:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Riley
ec42a286d0 Clara's Vacuum Flask 
Accepted Fluff Request: https://forum.vore-station.net/viewtopic.php?f=26&t=1831

Load out cost is one, the same as a standard vacuum flask, no freebies here!
Big thanks to everyone who put up with my confused screaming, especially Heroman :)
 2020-09-29 18:01:07 -04:00
ShadowLarkens
bf73137818 Add Shadow Larkens laptop fluff item 2020-09-20 03:35:28 -07:00
izac112
81871a960e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-10 21:50:42 +02:00
Unknown
3aae040622 Removes Reagent Implants 
As per a decision by staff, all whitelists for Reagent Implants (both milk and egg) have been rescinded, these are to be replaced by a generic 'Feeder' neutral trait that is now available as per this PR.

If you have any questions, concerns, or comments about this PR, it would be far better (for both yourself and my sanity) to direct those to the Head Staff.
 2020-08-06 14:52:49 -04:00
izac112
e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
izac112
e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
 2020-05-06 21:53:03 +02:00