cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,961 Commits 5 Branches 0 Tags
b3b51a7c3a57eccbf09db457c1faf8b38aa2324d
Commit Graph

36093 Commits

Author SHA1 Message Date
Novacat
8915cacb54 Merge pull request #6305 from VOREStation/upstream-merge-6564 
[MIRROR] Sex On The Beach recipe fix
 2019-12-13 20:54:27 -05:00
PrismaticGynoid
b22ec21911 Graffiti selection (#6562) 
* Lets you choose what type of graffiti or rune to draw when vandalizing the floor with crayons or markers. No more drawing and erasing a dozen times to get the exact graffiti you want.

* Puts in Mechoid's suggestion
 2019-12-13 20:37:14 -05:00
PrismaticGynoid
41d2af1dcb Drink fix (#6564) 
Fixes the Sex On The Beach drink being unable to be made by slightly altering the recipe - it's now made using the virgin version of the drink first, to prevent it from being interfered with by the Screwdriver recipe.
 2019-12-13 20:37:03 -05:00
timidvi
09e1d44279 More/Better Usagi Borg Sprites (Port) (#6533) 
* More/Better Usagi Borg Sprites (Port)

Adds some new sprites which are similar to our Usagi sprites, but a bit nicer/sleeker/more detailed looking. Ported from another server which shall be named if required but otherwise not in case Polaris admins prefer not to "advertise" other servers on its platforms.

Image of sprite fronts:
https://gyazo.com/5b35cb1b6f9d436e61fa330a5cdbb501
Backs/sides can be seen from the dmi itself.

May also have missed some little details somewhere else in the codebase which would need to be edited - I probably wouldn't know, since I've neither worked much with BYOND as a dev tool, nor with Github. This is very much an amateur working with what little they know - please enlighten me as necessary!

* Adds Usagi-II to module selection

* Added commas to module file
 2019-12-13 20:36:52 -05:00
Unknown
2e584ce3d0 Minor bug fixes 
- Ahelps sent by admins are no longer sent to discord
 2019-12-13 19:50:36 -05:00
Heroman3003
402d0acebf Fixes vorestation species without eyecolor being able to have eyecolor 2019-12-14 09:51:20 +10:00
Unknown
5ec5ac6e78 Chat fix by Aronai 
Fixes #6299
 2019-12-13 15:56:01 -05:00
Sebbe
313d2466e6 Makes pouncing waaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaay more fun 2019-12-13 10:59:28 +01:00
Unknown
f68a82b81f Replaces lentext with length 2019-12-12 13:13:18 -05:00
Unknown
985d57f323 513 Compatability 2019-12-12 10:40:27 -05:00
TheFurryFeline
f3832d1059 Atmos Intake Refactor 
- Minor refactor so mice don't... Spawn outside because of the filepath being a child of atmos for the vermin event spawning.

- More adjustments to Atmos. Missing Air Alarm added. Windows with blast doors for Intake area.
 2019-12-12 00:48:02 -05:00
Novacat
2f8da2582b Merge pull request #6291 from VOREStation/revert-6282-nova-basicfixes 
Revert "Ports Baystation Timer Subsystem"
 2019-12-10 21:08:48 -05:00
Novacat
309a7af8fc Merge pull request #6289 from EllyBrown/master 
Changes to my fluff clothing "Star Sweater" (#2)
 2019-12-10 20:58:50 -05:00
Unknown
73cd8c0a09 More Fixes 2019-12-10 20:57:04 -05:00
Novacat
a859ed8fac Revert "Ports Baystation Timer Subsystem" 2019-12-10 20:49:41 -05:00
EllyBrown
ea99d275e3 Update custom_clothes_vr.dm 2019-12-11 00:59:00 +02:00
EllyBrown
237b50bf7f Add files via upload 2019-12-11 00:09:42 +02:00
TheFurryFeline
4fd6dc9868 Fluff Item Fixy 
Fixes #5992
 2019-12-10 09:41:00 -05:00
Unknown
5705f65444 Post-patch Bug Fixes 
- Rana Starsong-Uma's fluff item is keyed to the right character
- Fixes an error where a Vorestation hair style was overriding a Polaris one
 2019-12-10 00:05:21 -05:00
Unknown
a7711708c8 Fixes Diff issues 2019-12-09 13:22:13 -05:00
Unknown
894bde2c09 Ports Baystation Timer Subsystem 2019-12-09 13:16:07 -05:00
Novacat
1814dda55b Merge pull request #6279 from VOREStation/upstream-merge-6541 
[MIRROR] Adds Teshari Underfluff marking
 2019-12-09 09:27:26 -05:00
Unknown
8a11325fda Removes duplicate 2019-12-09 09:07:11 -05:00
listerla
fad12cddfa Ports a ton of hair (#6549) 2019-12-08 17:41:20 -05:00
listerla
a099218780 Adds Teshari Underfluff (#6541) 2019-12-08 17:36:46 -05:00
Unknown
ea4c6075b7 Fixes busted syringes 2019-12-07 10:25:28 -05:00
Unknown
d92e151dab Fixes typo name 2019-12-06 19:32:35 -05:00
Unknown
f42cd78de3 Fixes Elven Weapons 2019-12-06 19:14:35 -05:00
Unknown
192dd12e7f Attempts to fix Gladius 2019-12-06 18:59:35 -05:00
Unknown
9435f5720d Misc Tweaks Pt. 2 
- Slightly increases Centcom/Modified translocator energy costs
 2019-12-06 18:44:16 -05:00
Unknown
d8392dfe8b More updates 2019-12-06 18:24:18 -05:00
Unknown
a3c48e6eca how did that get deleted 2019-12-06 17:18:05 -05:00
Unknown
062d8ec39c Merge remote-tracking branch 'VOREStation/master' into nova-basicfixes 2019-12-06 17:10:23 -05:00
Unknown
5499e3272f Miscellaneous fixes 
- Fixes holodeck eswords
- Fixes toy swords not showing the blade
- Temporarily disables vent sounds

Fixes #6265
 2019-12-06 17:10:13 -05:00
Novacat
e5c7d83aba Merge pull request #6222 from Novacat/nova-pathfinder 
Centcom/Tether Ship Changes
 2019-12-06 16:06:56 -05:00
Novacat
26b0f83192 Merge pull request #6241 from Heroman3003/black-eyed-fluffers 
New Species: Black-Eyed Shadekin
 2019-12-06 11:37:23 -05:00
Spades
7a77a3296d Merge pull request #6268 from Novacat/nova-branchfix 
Dragor Vendor Changes
 2019-12-06 10:55:28 -05:00
Spades
f977f0988c Merge pull request #6267 from Verkister/yehaw 
Some more simplemob QoL and fixes.
 2019-12-06 10:54:40 -05:00
Spades
485ca0534f Merge pull request #6243 from Mithrandalf/mouse 
I improved mice
 2019-12-06 10:51:36 -05:00
Novacat
ccae9c2a58 Merge pull request #6272 from VOREStation/upstream-merge-6557 
[MIRROR] Stops bots from opening elevator doors
 2019-12-05 22:43:32 -05:00
Novacat
8153e08484 Merge pull request #6270 from VOREStation/upstream-merge-6545 
[MIRROR] Adds Irrlicht's 'soft' shroud
 2019-12-05 19:11:03 -05:00
Novacat
a73726fd19 Update bot.dm 2019-12-05 19:10:29 -05:00
Heroman3003
00c1e44852 Stops bots from opening elevator doors 2019-12-05 18:30:20 -05:00
lolman360
e2b47484c8 Fixy-wixies the fucky-wucky I madey-wadey with toy swords. (#6526) 
* one

* rtwo

* image

* Update material_weapons.dm

* Update toys.dm

* Revert "Update material_weapons.dm"

This reverts commit 1a37bb015a5e503a4c5f0433bc279f15514319a7.

* Revert "image"

This reverts commit 6496dd404d0eb740e158fbc94322f6944f508886.

* Revert "rtwo"

This reverts commit 3b7aacd6c830e52986f2a34abf5b5ccbfbb135f8.

* Revert "one"

This reverts commit 324d188058c0a824c0259e2d6b98f69e563846bd.

* Update toys.dm
 2019-12-05 18:29:06 -05:00
listerla
086cfb579c Adds Irrlicht's 'soft' shroud (#6545) 
* Adds Irrlicht's soft Shroud

* fixes
 2019-12-05 18:28:53 -05:00
Heroman3003
69ca6dc2f3 Gives crewkin less weakness to attacks, but weaker bones 2019-12-03 09:54:00 +10:00
Unknown
3537646c10 Dragor Vendor Changes 
- Hot drinks reduced to 2 thalers
- Ramen reduced to 2 thalers
- Skrellsnax reduced to 2 thalers
- Protein Shake reduced to 15 thalers
- Towel reduced to 20 thalers
- Protein container (Empty) reduced to 1 thaler
- Number of protein shakes per vendor increased to 16
- Liquidprotein cost reduced to 5 thaler
 2019-12-02 11:43:27 -05:00
Verkister
a785517e82 how many is there 2019-12-01 13:20:00 +02:00
Verkister
390bf6d91a more grammar fixes etc 2019-12-01 13:09:58 +02:00
Verkister
e62445ff39 bruh 2019-12-01 12:56:27 +02:00