cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 05:52:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,281 Commits 7 Branches 0 Tags
29e187bb83b5eb671001d05bed08cbdccf8f96e8
Commit Graph

35689 Commits

Author SHA1 Message Date
Schnayy
29e187bb83 Adds 10 new clothes + sprite fixes. (#6575) 2019-12-20 00:44:28 -05:00
Spades
ec6ecb13ae Merge pull request #6303 from Novacat/nova-basicfixes 
Minor bug fixes
 2019-12-19 22:22:09 -05:00
TheFurryFeline
1658258d47 Merge remote-tracking branch 'upstream/master' into TFF-Seed_Vendor-Brig_Version 2019-12-19 20:26:57 -05:00
TheFurryFeline
5d46a6290d Brig Safety Lessons 
Changes the vendors in the brig to not have size changing stuff or syringes.

Changelog Notes:

- Removes syringes from Nutrimax.

- Removes grow/shrink shrooms from seed storages.

Note: Do not merge this until after my prior map PR is merged and I've dealt with the conflicts. This change is so minor that resolutions of said conflicts will be speedy.
 2019-12-19 18:51:47 -05:00
Meghan-Rossi
6530bc2e9f Merge remote-tracking branch 'origin/master' into prybars 2019-12-19 20:52:03 +00:00
Novacat
0432002af7 Merge pull request #6327 from VOREStation/upstream-merge-6558 
[MIRROR] Change various global species lists to GLOB versions, adds 2 more event subspecies.
 2019-12-19 15:46:59 -05:00
Novacat
af3939477f Merge pull request #6326 from VOREStation/upstream-merge-6520 
[MIRROR] Clean up dead code obsoleted by outfit system
 2019-12-19 15:46:48 -05:00
TheFurryFeline
82e5064e11 Mimic Grammar. 
Fixes extra "the"'s.
 2019-12-19 13:57:35 -05:00
Meghan-Rossi
f59e2811e3 Merge branch 'upstream-merge-6520' into prybars 2019-12-19 18:47:49 +00:00
Meghan-Rossi
ef7dfaa6cc Resolve conflicts, fix compile errors 2019-12-19 18:44:47 +00:00
Meghan-Rossi
604fd1b74f Resolve conflicts, fix compile errors 2019-12-19 17:49:21 +00:00
Verkister
0c074e501a Fixes loadout webbings/pouches for explorers 
Fixes loadout webbing vests and drop pouches lacking explorer access despite clearly stating its presence on the display name.
 2019-12-19 15:41:03 +02:00
Atermonera
6ebd1afa7e Merge pull request #6571 from Mechoid/FixSupply_Conversion 
Fix Supply_conversion.dm runtime.
 2019-12-18 16:54:34 -05:00
Verkister
a20df0bdea Fixes belly transfer sound duplication. 
But also disables it due to redundancy. The fixed bit will still be there should it become relevant again at some point.
 2019-12-18 16:54:20 +02:00
TheFurryFeline
23e3d6c775 Unused Lore 
Changelog Notes:

- Removes a poster that refers to sub-breeds of Prommies in lore that we don't use in Virgo's own lore.
 2019-12-17 21:33:14 -05:00
TheFurryFeline
53cd282a91 Combat Drone Location Fixy 
VOREStation edits for Sif -> Virgo 3B orbit, basically.

Changelog Notes:

- Changes instances of Sif to Virgo 3b since Tether is in Virgo-Erigonne.
 2019-12-16 22:59:03 -05:00
Atermonera
3b7a737c08 Change various global species lists to GLOB versions, adds 2 more event subspecies. 2019-12-16 00:52:29 -05:00
Atermonera
ef75d1c2a0 Clean up dead code obsoleted by outfit system 2019-12-16 00:51:16 -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