cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-25 09:31:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,904 Commits 8 Branches 0 Tags
981fa2febb7572055bb0ccd6f36f57c5b0d0ee31
Commit Graph

35049 Commits

Author SHA1 Message Date
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
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
Novacat
cfcffaeb4d Merge pull request #5727 from Heroman3003/power-shuttle-fix 
Fixes power not updating when shuttle moves
 2019-08-28 16:21:32 -04:00
Novacat
fa340c6cba Merge pull request #5728 from Heroman3003/idfix 
Fixes editing CD access breaking CD access list
 2019-08-28 16:21:15 -04:00
TheFurryFeline
3ea538b217 Shush, Travis 
More error fixing that don't show up in DM.
 2019-08-28 15:36:47 -04:00
TheFurryFeline
11627e943f Fix Rogueminer_vr 
Errors popped up in Travis that didn't show on DM. Thank you... Fixing the screechuing, I hope.
 2019-08-28 15:14:43 -04:00
TheFurryFeline
c068e984f7 Cleanup of Areas Placement 
On the tin, moves all areas from Space Station 13 areas_vr.dm and puts it in tether_areas2.dm
 2019-08-28 13:37:20 -04:00
Heroman
66c6c1b422 Fixes editing CD access breaking CD access list 2019-08-28 19:04:47 +10:00
Heroman
819d211b23 Fixes power not updating when shuttle moves 2019-08-28 18:21:52 +10:00
Unknown
14eb525030 Adjusts Vorestation pills and pillbottles 2019-08-28 04:06:19 -04:00
Novacat
ffb66290db Merge pull request #5726 from VOREStation/upstream-merge-6418 
[MIRROR] Shards Do Damage to Holder
 2019-08-28 01:54:38 -04:00
Novacat
4eea2dad56 Merge pull request #5725 from VOREStation/upstream-merge-6423 
[MIRROR] Ports Bay's stomach pump.
 2019-08-28 01:54:26 -04:00
Atermonera
2162dbfa0b Merge pull request #6418 from MisterLayne/glass_shard_self_harm 
Shards Do Damage to Holder
 2019-08-28 01:25:47 -04:00
Atermonera
4bb0599153 Merge pull request #6423 from chaoko99/stomach_pump 
Ports Bay's stomach pump.
 2019-08-28 01:25:37 -04:00
Unknown
20d87447a9 Removes HoS Voidsuit Stats 2019-08-28 01:24:48 -04:00
Atermonera
bf558eacfd Merge pull request #6417 from MisterLayne/conductivity_fix 
Non-conductive Things Do Not Conduct
 2019-08-28 01:24:24 -04:00
Heroman
0cc54904e2 Fixes slimes not dying outside 2019-08-27 19:52:15 +10:00
Heroman
0ce08f5d36 Fixes meat and density 2019-08-27 15:54:31 +10:00
Heroman
0ebd19a37c Adds morphs 2019-08-27 14:18:17 +10:00
Novacat
98c1225e32 Merge pull request #5717 from VOREStation/upstream-merge-6419 
[MIRROR] Should solve the I.C. printer HREF exploit.
 2019-08-26 23:43:54 -04:00
Atermonera
7fc19250e6 Merge pull request #6419 from Mechoid/PrinterHREF 
Should solve the I.C. printer HREF exploit.
 2019-08-26 23:33:03 -04:00
Atermonera
ec9f1e0e3d Merge pull request #6420 from Mechoid/WhyAmILikeThis 
Fix SLED infinite looping.
 2019-08-26 23:32:52 -04:00
Glassbrain
b8a202baa9 Customise Say Verb Change 
Changes the "customise say verb" verb to "customise speech verb", solving a small problem of inconvenience that arises when typing "say" incompletely into the command bar, such as if you have a bad habit solidifed into muscle memory.
 2019-08-26 19:19:39 -03:00