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
73,822 Commits 8 Branches 0 Tags
d6048bd409f34497450c98e1537c47c20ec364a0
Commit Graph

1711 Commits

Author SHA1 Message Date
TheFurryFeline
5956dd62d8 Requested Changes 
Includes commenting out gun that had a permit for it.
 2019-11-28 11:06:56 -05:00
TheFurryFeline
0c2c70ce48 Whoops. 
That feeling when you forget about this little refactor. Pfft.
 2019-11-28 09:02:30 -05:00
TheFurryFeline
d0ed6c5702 Fixes Collars Not Spawning 
Title. Fixes https://github.com/VOREStation/VOREStation/issues/6225
 2019-11-25 21:16:26 -05:00
Repede
7035e30fc3 Fixed blizzard so animals do not get killed 
Fixed the exploration shuttle console
Fixed the snowsuits sprites and actually works in cold temp
 2019-11-24 16:57:06 -05:00
Hawk_v3
bafec81a0a Merge Upstream 2019-11-22 23:40:13 +00:00
Heroman
0e1b4427fe Fixes loadout being broken 2019-11-22 13:08:09 +10:00
Novacat
11ae9361af Cleans up comments 2019-11-21 20:50:49 -05:00
Heroman3003
e7f2ca8055 Hopefully fixes disappearing loadouts 2019-11-22 11:27:28 +10:00
Wickedtemp
1769dd9e8d Hopefully makes my fluff-stuff spawn WORN 
Having a custom bag spawn in my internals box instead of on my back is annoying...also smol name edit because girlfren's character changed the last name spelling of their character and since our characters are married, gotta fix! 

but yeah hopefully this fixes it. it worked on private serber.
 2019-11-19 23:34:34 -06:00
Hawk_v3
a5c7909ed7 Merge remote-tracking branch 'upstream/master' 2019-11-17 12:42:55 +00:00
Unknown
9d7c9714f3 Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin 2019-11-15 12:12:55 -05:00
Heroman3003
ab603cffa4 Finishes up the main shadekin features 2019-11-15 11:13:31 +10:00
Heroman3003
62889c39d9 Removes deprecated code 2019-11-15 08:38:53 +10:00
Meghan-Rossi
a09456b541 Adds a way to set the tag of loadout collars as part of the loadout 2019-11-13 03:42:03 +00:00
Shadow
48ba6c652d Changes character's name for fluff item 2019-11-11 22:56:25 -06:00
Novacat
929ff8077c Merge pull request #6171 from EllyBrown/master 
Elly Brown (bacon12366) fluff item.
 2019-11-08 16:35:08 -05:00
EllyBrown
96e1934a90 Add files via upload 2019-11-08 21:37:33 +02:00
Hawk_v3
f976948ce3 Merge remote-tracking branch 'upstream/master' 2019-11-07 19:54:10 +00:00
Meghan-Rossi
6bee95ef01 Fluff items 
Removes Tasald's coat and loyalty implanter as requested in #6147
Adds Tasald's Cartographer's Uniform as approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1627
adds medals:
Xander Bevin - Conduct - https://forum.vore-station.net/viewtopic.php?f=27&t=1579
Nick Sloan - Conduct - https://forum.vore-station.net/viewtopic.php?f=27&t=1575
Erik Ramadwood - Unity - https://forum.vore-station.net/viewtopic.php?f=27&t=1624
Nolan Conaway - Unity - https://forum.vore-station.net/viewtopic.php?f=27&t=1622

Resolves #6147
 2019-11-05 11:28:37 +00:00
Keila-coon
30f1f326bc Fixed a typo for loadout fluff items. 
Fixed a typo for Mocha's fluff items
 2019-11-03 00:58:07 -04:30
Keila-coon
c79716305d Fixed more typos for fluff items 
Fixed a typo for Mocha's fluff items
 2019-11-01 08:49:52 -04:30
Keila-coon
fcec9a87f5 Fixed a typo for fluff items 
Fixed a typo for the modkit for Moca_The_Porg1
 2019-10-30 20:24:26 -04:30
Keila-coon
498906bba3 Fixed another typo for fluff items 
Fixed the path for cheekycrenando's fluff item
 2019-10-30 00:08:43 -04:30
Keila-coon
7afffc5096 Added modkit for fluff item 
Modkit for mocha's suit
 2019-10-29 22:34:59 -04:30
Anewbe
d7c0195212 Merge pull request #6500 from KasparoVy/you_tracking_implanted_the_floor 
Loadout Implants Properly go in Mob, not on Floor
 2019-10-29 20:34:36 -04:00
Rykka Stormheart
c177796c2d Add Sounds to stuff! (Port from VOREStation) 2019-10-29 17:32:08 -04:00
Keila-coon
91015b5828 Merge branch 'master' into master 2019-10-29 15:30:28 -04:00
Keila-coon
4bc71346b0 Added hagawaga and moca_the_porg1 fluff item request plus an extra tail 
Roman armor and Explorer suit

Striped tail, colorable
 2019-10-29 14:39:25 -04:30
Heroman3003
a3fb3e3950 Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin 2019-10-29 09:33:48 +10:00
Repede
411ac25f49 fixes typo with fluff item for srusu 2019-10-27 23:08:11 -04:00
Repede
3e3bb830e2 Fluff items additions 
+ NESGamer Lucy Price Cryostatis Thermos
+ Captmatt Kaenin medal of valor
+ Risingstar Stellar heart collar
+ cheeky srusu soviet uniform
 2019-10-26 19:43:12 -04:00
Hawk_v3
3c8cd11eac Reupdated Station 1 map 2019-10-24 21:57:58 +01:00
Mechoid
169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
DameonOwen
22674b143a Fix cookie not deleting self. Add cookie to Amber Owen's loadout. 2019-10-19 15:25:31 -04:00
Repede
7bd184600a Self-indulge commit: Adds CC Officer colored uniform and cloak for Teshari. 
Fluffed it to Strix Hades as a loadout option.
 2019-10-08 19:20:27 -04:00
Hawk_v3
2cc8800ede Merge remote-tracking branch 'upstream/master' 2019-10-08 15:14:36 +01:00
Atermonera
5a3398daec Merge pull request #6473 from Woodratt/09272019_weightbodytype 
Port weight/body types to traits
 2019-10-06 03:34:05 -04:00
Hawk_v3
6e801b1e8e Map Updates. 2019-10-04 01:52:44 +01:00
gozulio
02ab22cae8 Properly fixes white cane 
Properly fixes white cane fluff item and corrects misleading comment in example code comment.
 2019-10-02 21:55:27 -04:00
gozulio
e90dc57a71 Attempt to fix white cane, Removes character_name whitelist 2019-10-02 20:11:47 -04:00
Verkister
855d795357 Some Protean fixes 
-Fixes protean regeneration not working at all.
-Fixes not being able to get metal as blob.
-Fixes unblobbing as custom size breaking vertical offset.
-Adds a general use loadout fluff vest planned for a prottie char.
-Fixes blobmob being slow due to mob update movement delays.
-Gives protties trasheat verb.
 2019-10-01 10:30:29 +03:00
gozulio
a0500afe7c Ad Jessie's white cane item 2019-10-01 02:44:38 -04:00
Repede
041da2cfbd Merge branch 'self' of https://github.com/Yawn-Wider/YWPolarisVore into self 2019-09-30 14:30:12 -04:00
Repede
6c0e8a9728 Takira fluff suit and mask, no armor values. 2019-09-30 14:29:26 -04:00
Hawk_v3
f186d115d6 Merge remote-tracking branch 'upstream/master' 2019-09-29 21:53:16 +01:00
Hawk_v3
691a1239f4 Merge from Vorestation 2019-09-29 21:53:09 +01:00
Repede
d15543309e b i g b r a i n - Fixing typo 2019-09-29 14:14:57 -04:00
Repede
70f3576ba2 Strix new headset 2019-09-29 14:08:07 -04:00
Heroman
f6f2acca6f Adds Melanie's Skeleton 2019-09-29 14:28:56 +10:00
GeneriedJenelle
c29c821075 Ports Earrings from Baystation 2019-09-25 17:09:11 -04:00