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

35705 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
Novacat
8b9806c8c4 Merge pull request #6351 from VOREStation/upstream-merge-6578 
[MIRROR] Add sanity check to cyborg _onclick.
 2019-12-21 16:14:22 -05:00
Atermonera
6b462af3ee Merge pull request #6569 from TheFurryFeline/TFF-Bulbs_Recycling 
Light Replacer QOL
 2019-12-21 14:31:10 -05:00
Atermonera
992312087f Merge pull request #6578 from Mechoid/FixCyborgOnClick 
Add sanity check to cyborg _onclick.
 2019-12-21 14:29:55 -05: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
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
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
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