cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,468 Commits 8 Branches 0 Tags
7c492a3d17ec54cb5c0158979f9827a57cb15d53
Commit Graph

35865 Commits

Author SHA1 Message Date
Novacat
c53a08d938 Update human_attackhand.dm 2019-08-31 22:21:44 -04:00
Novacat
d1ec7415f5 Update human_attackhand.dm 2019-08-31 22:18:06 -04:00
Atermonera
a1f814a44b Fixed air injectors 2019-08-31 18:09:31 -04:00
Atermonera
725d42b10c glove attack refactor 2019-08-31 18:08:17 -04:00
Novacat
5eaebcf0df Merge pull request #5757 from Rykka-Stormheart/shep-dev-phaser-buff 
Buff Frontier Phasers by reducing charge time to sub-30 seconds.
 2019-08-31 17:21:08 -04:00
Novacat
ca6c795661 Update custom_guns_vr.dm 2019-08-31 17:07:30 -04:00
Rykka
ae2086b288 Updates as per review. 2019-08-31 15:01:00 -06:00
Rykka
a51070d192 Fix var/phase_power defined twice 2019-08-31 14:34:00 -06:00
Rykka
86a4b20a36 Updated values as per Novacat's Review 2019-08-31 14:31:18 -06:00
Unknown
aa2a3682b9 Merge remote-tracking branch 'VOREStation/master' into medbeam 2019-08-31 15:32:22 -04:00
Unknown
bbf1fc1420 Recommended changes 2019-08-31 15:31:45 -04:00
Novacat
a000151fbf Merge pull request #5756 from Cameron653/Boot_fix 
Fixed an issue with multiple boot/shoe overlays.
 2019-08-31 15:05:06 -04:00
Rykka
1ac0fd8648 Reduces Phaser Charge Time to sub-30 seconds 2019-08-31 12:58:19 -06:00
Novacat
502f9c79a6 Merge pull request #5755 from Rykka-Stormheart/shep-dev-minor-fixes 
Minor Bugfixes/Tweaks - Expedition-focused.
 2019-08-31 14:44:51 -04:00
Cameron Lennox
9f6e4df7eb Fixed an issue where boot/shoe overlays would magically be cleaned by putting in a knife and stepping on blood. 2019-08-31 14:41:24 -04:00
Unknown
becf44405d Reverts balance changes 2019-08-31 14:36:18 -04:00
Novacat
6e4244eb12 Merge pull request #5754 from HzDonut/MusicianFix 
Musician.dm Fix
 2019-08-31 14:30:25 -04:00
Rykka
a0f7577e96 Minor Bugfixes/Tweaks - Expedition-focused. 
Addresses V2 atmos tiles not allowing shots over them, and reduces charge/crank time for frontier phasers, as well as buffing them - you can reload while moving. QOL! <3
 2019-08-31 11:29:50 -06:00
Donut
964cc0e2c1 Musician.dm Fix 
The person who did the port from TG flipped the defines around. Whoops.
 2019-08-31 10:53:47 -04:00
Mewchild
54ec20f5fa Makes the pens comfy 2019-08-31 09:40:39 -05:00
Rykka
981fa2febb Fixed Gitkraken Error. Oops </3 2019-08-31 06:32:58 -06:00
Rykka
83447b6d76 Adds Fen-PAI + Icons, Courtesy of VerySoft! <3 2019-08-31 06:27:24 -06:00
Rykka
e2093c332c pAI Fennec Chassis added 
Waiting on sprite from Soft <3
 2019-08-31 05:28:49 -06:00
Novacat
a39a8f8277 Merge pull request #5745 from Novacat/nova-basicfixes 
Minor Fixes Part two
 2019-08-31 01:39:01 -04:00
Novacat
cffaa2c9e4 Merge pull request #5711 from Rykka-Stormheart/Shep-dev-branch 
Mouse Tweaks, and fixes - Blame Polaris. <3
 2019-08-31 01:38:43 -04:00
Novacat
1f547beef5 Merge pull request #5731 from Novacat/nova-heterochromia 
Buffs Mini Translocator
 2019-08-31 01:37:40 -04:00
Novacat
5dc04a75e8 Merge pull request #5718 from Heroman3003/morphology 
Adds morphs
 2019-08-31 01:35:42 -04:00
Novacat
8b2cd00e5e Merge pull request #5669 from Novacat/nova-pathfinder 
Adds Compact Cataloguers
 2019-08-31 01:35:24 -04:00
Novacat
bf65808976 Merge pull request #5747 from Novacat/nova-weapons 
Early Polaris Ports
 2019-08-31 01:10:47 -04:00
Unknown
853f3964a3 Pathing errors 2019-08-31 00:57:37 -04:00
Unknown
9467621800 Fixes some errors 2019-08-31 00:35:19 -04:00
Unknown
0d73c8ad76 Early Polaris Ports 
Ports Polaris PRs 6424, 6426, 6428, 6430, 6431, 6432, 6433, and 6434

No vorestation edit markings because they are polariscode ports.
 2019-08-30 23:55:58 -04:00
Heroman
fe8fa41688 Unrestricts medical and research cloaks 2019-08-31 13:23:53 +10:00
Unknown
975d879433 Minor Fixes Part two 
- Ion Spiders now use a weaker ion projectile
- Garbage collection now only complains if it takes longer than two seconds
 2019-08-30 20:29:02 -04:00
Hawk_v3
b6ebecf7ec Merge remote-tracking branch 'upstream/master' 2019-08-30 21:38:17 +01:00
Heroman
f5f9c8e55e Makes it possible to mobswap with Fluffy 2019-08-31 06:13:19 +10:00
Heroman
81048cc4b4 Fixes description not updating on restoration 2019-08-31 05:22:01 +10:00
Verkister
febabf8899 Actually fixes icon scaling on later byond versions 
-Fixes the missing KEEP_TOGETHER flag required for overlay scaling in the newer versions.
-Fixes it for all atoms, not just mobs that have gone through vore setup. Literally nothing needs mismatched overlay scaling.
-Fixes the toggle scaling mode verb having been made to toggle the inheritance flag as well for no fucking reason what the hell.
-Actually tested working before pushing.
 2019-08-30 15:53:16 +03:00
Spades
9882dc85f4 Merge pull request #5729 from TheFurryFeline/TFF_Tether_Areas_Spring_Cleaning 
Cleanup of Areas Placement
 2019-08-30 07:42:20 -04:00
Spades
e116810e32 Merge pull request #5719 from Heroman3003/slimefix 
Fixes slimes not dying outside
 2019-08-30 07:41:28 -04:00
Rykka
c94d5271d2 Merge remote-tracking branch 'Virgo_Master/master' into Shep-dev-branch 2019-08-30 00:04:03 -06:00
Anewbe
083a0634a0 Merge pull request #6429 from Heroman3003/idfix 
Fixes editing colony director IDs editing global 'station access' list
 2019-08-29 18:27:58 -04:00
Novacat
a006728e5d Merge pull request #5708 from Novacat/nova-basicfixes 
Minor Fixes
 2019-08-29 15:07:28 -04:00
Unknown
1607c10755 Suggested Changes 2019-08-29 04:04:32 -04:00
Unknown
9390884ca7 Buffs Mini Translocator 
- Removes Z level restriction on mini translocator
- Decreases charge cost of mini translocator from 2400 to 480
- Mini Translocator starts with a device cell instead of a weapon cell
- Removes illegal tech level from Mini translocators

The overall effect is that mini translocators still start off with one charge and one beacon, but can now be used across z levels. Mini translocators can also be equipped with a weapon cell that gives them five charges instead of one.
 2019-08-29 00:20:02 -04:00
Rykka
98b46766b3 Merge branch 'master' into Shep-dev-branch 2019-08-28 19:19:59 -06:00
Novacat
1ead38b84e Merge pull request #5730 from Heroman3003/spicedesc 
Adds description to Request Spice
 2019-08-28 19:35:19 -04:00
Heroman
cd5f25b853 Also adds feedback message 2019-08-29 08:12:11 +10:00
Heroman
ba71025007 Adds description to Request Spice 2019-08-29 07:59:39 +10:00
TheFurryFeline
73f9a0d2df Please, Travis.... 
One additional attempt to get travis to cooperate...
 2019-08-28 16:41:53 -04:00