cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,235 Commits 10 Branches 0 Tags
604fd1b74f2af1e997a3be09480e3a95041e65ef
Commit Graph

35671 Commits

Author SHA1 Message Date
Meghan-Rossi
604fd1b74f Resolve conflicts, fix compile errors 2019-12-19 17:49:21 +00:00
Atermonera
3b7a737c08 Change various global species lists to GLOB versions, adds 2 more event subspecies. 2019-12-16 00:52:29 -05:00
Novacat
dbef0774d6 Merge pull request #6314 from VOREStation/upstream-merge-6529 
[MIRROR] Remove unused simple_animal files
 2019-12-15 23:54:50 -05:00
Unknown
53c99524ba compatibility fixes 2019-12-15 23:45:00 -05:00
Novacat
dba6980b8d Merge pull request #6322 from VOREStation/upstream-merge-6567 
[MIRROR] EPv2 x Communicator fix.
 2019-12-15 23:36:47 -05:00
Novacat
1daafdb828 Merge pull request #6319 from VOREStation/upstream-merge-6563 
[MIRROR] 513 Compatability
 2019-12-15 23:34:34 -05:00
Novacat
8b541d00e3 Update messaging.dm 2019-12-15 23:27:50 -05:00
Novacat
cdd1e18b8b Update typeids.dm 2019-12-15 23:25:44 -05:00
Novacat
7b5840db96 Merge pull request #6321 from VOREStation/upstream-merge-6566 
[MIRROR] Fix Multitool Modes
 2019-12-15 23:24:48 -05:00
Novacat
d7752480ca Merge pull request #6318 from VOREStation/upstream-merge-6561 
[MIRROR] Gives appropriate hairstyles the hair_tieable flag.
 2019-12-15 23:24:37 -05:00
Novacat
64a403b4de Merge pull request #6316 from VOREStation/upstream-merge-6552 
[MIRROR] AIs properly use radios in shells, clerical gets command.
 2019-12-15 23:24:14 -05:00
Novacat
b98ec8209f Merge pull request #6315 from VOREStation/upstream-merge-6518 
[MIRROR] Bookbinder 2, Boogaloo.
 2019-12-15 23:23:55 -05:00
Atermonera
9ba1566211 EPv2 x Communicator fix. 2019-12-15 14:54:01 -05:00
Atermonera
838b6dce3e Merge pull request #6566 from Mechoid/MultitoolFix 
Fix Multitool Modes
 2019-12-15 14:52:47 -05:00
Atermonera
ba8a46bb03 Merge pull request #6565 from Heroman3003/eyecolor-fix 
Fixes species without eyecolor being able to get one
 2019-12-15 14:49:27 -05:00
Atermonera
c8a59aa5f7 513 Compatability 2019-12-15 14:48:14 -05:00
Atermonera
8bdc4df281 Merge pull request #6561 from Schnayy/hairtie_fix 
Gives appropriate hairstyles the hair_tieable flag.
 2019-12-15 14:43:53 -05:00
Atermonera
4eb2254f66 Merge pull request #6552 from Mechoid/OfRobotsAndChannels 
AIs properly use radios in shells, clerical gets command.
 2019-12-15 14:40:25 -05:00
Atermonera
6e7a2860dd Merge pull request #6518 from Mechoid/FuckingBookbinder 
Bookbinder 2, Boogaloo.
 2019-12-15 14:37:06 -05:00
Atermonera
6ca6188096 Remove unused simple_animal files 2019-12-15 14:36:55 -05:00
Novacat
f8d71fadcc Merge pull request #6311 from VOREStation/synthpurge 
Add synth reagent purge verb
 2019-12-14 18:01:29 -05:00
Novacat
9a74b3d94f Merge pull request #6293 from TheFurryFeline/TFF-Atmos_Lockdown_Restoration 
Lock Atmos Down Time
 2019-12-14 17:34:59 -05:00
Novacat
8b857b545d try to fix travis 2019-12-14 17:31:25 -05:00
Aronai Sieyes
72572b206e Typo! 2019-12-14 14:29:55 -05:00
Arokha Sieyes
b207694f2d Add synth reagent purge verb 
Allows synths to purge reagents in them. Not really a balance issue since the reagents can't affect them, pretty much just affects vore. And flavoring I guess!

Probably works? Probably. ... Probably.
 2019-12-14 14:28:46 -05:00
Arokha Sieyes
007fda1bc1 Fix nifsoft vendor runtime 
Caused by the vendor attempting to throw intangible software at people either due to wires cut or vendor virus.
 2019-12-14 13:57:52 -05:00
Novacat
8d4fc2f1eb Merge pull request #6309 from Verkister/513bloops 
Some runtime spam fixes. Also fixes fake AO.
 2019-12-14 08:21:40 -05:00
Verkister
9319b62bd1 Some runtime spam fixes. Also fixes fake AO. 
-Fixes several instances of runtime spam caused by lack of sanity checks in nifsoft procs.
-Fixes a runtime spam caused by 512>513 transition having renamed a fake ao filter argument.
-This also fixes the fake ao.
 2019-12-14 11:12:41 +02:00
saysage
c6bed66e10 Two new undershirts (#6556) 
* Add files via upload

* Add files via upload
 2019-12-14 04:04:15 -05:00
Novacat
e29f474b8d Merge pull request #6302 from Heroman3003/blackeye-fix 
Fixes vorestation species without eyecolor being able to have eyecolor
 2019-12-13 20:56:24 -05:00
Novacat
c819bbd6da Merge pull request #6306 from VOREStation/upstream-merge-6562 
[MIRROR] Graffiti selection
 2019-12-13 20:54:38 -05:00
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
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
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