cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 13:13:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,316 Commits 6 Branches 0 Tags
e70816822bbeb7bba99df9b5150fe85e294c950c
Commit Graph

23513 Commits

Author SHA1 Message Date
Spades
e70816822b Merge pull request #6298 from Sebbe9123/dogborgpounce 
Buffs dogborg pounce
 2019-12-22 10:41:57 -05:00
Novacat
11405d5c00 Merge pull request #6358 from VOREStation/upstream-merge-6582 
[MIRROR] QM can now get optical meson scanners
 2019-12-22 10:35:34 -05:00
Novacat
324db0bc2b Merge pull request #6357 from VOREStation/upstream-merge-6580 
[MIRROR] APCs/Air Alarms can be (un)locked via altclick
 2019-12-22 10:35:25 -05:00
Atermonera
b6a81efb9a Merge pull request #6582 from Shadow-Quill/Material-Scanner-Access 
QM can now get optical meson scanners
 2019-12-22 01:59:32 -05:00
Atermonera
2ec24a29e3 Merge pull request #6580 from Shadow-Quill/APC-AirAlarm-Alt-Click 
APCs/Air Alarms can be (un)locked via altclick
 2019-12-22 01:58:19 -05:00
Shadow-Quill
07f92de49a Belly Fixed 2019-12-22 00:40:58 -06:00
Sebbe
a2a19321c9 Ace changes 2019-12-20 10:31:17 +01:00
Novacat
cd62e018a6 Merge pull request #6345 from VOREStation/upstream-merge-6576 
[MIRROR] Moves custom books to main repo.
 2019-12-20 01:15:23 -05:00
Novacat
9a716ad431 Merge pull request #6343 from VOREStation/upstream-merge-6577 
[MIRROR] Examining power cells state their name and size
 2019-12-20 01:12:20 -05:00
Schnayy
9c6881148e Moves custom books to main repo. (#6576) 
* Moves custom books to main repo.

* Fixes some oopsie woopsies.
 2019-12-20 01:04:47 -05:00
Atermonera
78f32303a5 Examining power cells state their name and size (#6577) 2019-12-20 00:45:43 -05:00
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
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
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
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
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
Sebbe
ec76f31285 Adjusts to 90%. adds 2 seconds of stun as suggested. 2019-12-16 09:52:20 +01: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
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
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
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
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
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
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
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