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
52,570 Commits 8 Branches 0 Tags
a77da3b5df1dfcd33b9f645c3e576a77d3db8556
Commit Graph

24877 Commits

Author SHA1 Message Date
Aronai Sieyes
72511b9fa7 Rewords grab facesits 
Let's be real here. It's facesits.
 2020-05-04 23:21:46 -04:00
Aronai Sieyes
5134f60956 Merge pull request #7639 from VOREStation/aro-penspam 
Add cooldown to pen clicks
 2020-05-04 23:18:53 -04:00
Aronai Sieyes
8216144ab9 Add cooldown to pen clicks 
Fixes https://github.com/VOREStation/VOREStation/issues/7000
 2020-05-04 23:06:38 -04:00
Aronai Sieyes
ad9cdaade6 Merge pull request #7637 from VOREStation/aro-shake 
Fix protein shaker name
 2020-05-04 21:12:09 -04:00
Aronai Sieyes
08c371e271 Merge pull request #7636 from VOREStation/aro-condi 
Fix condiment container infinite range
 2020-05-04 21:05:28 -04:00
Aronai Sieyes
1978246176 Merge pull request #7633 from VOREStation/aro-roles 
Add prefs for Be Morph, Be Maintpred, Be Lost Drone
 2020-05-04 21:05:14 -04:00
Aronai Sieyes
3c66e23442 Merge pull request #7631 from VOREStation/aro-fix7601 
Fixes #7601
 2020-05-04 21:04:50 -04:00
Aronai Sieyes
ff5bf6569e Merge pull request #7552 from ShadowLarkens/vore_refactor_mk2 
Vore refactor V2
 2020-05-04 21:04:20 -04:00
Aronai Sieyes
fa13c1089f Fix protein shaker name 2020-05-04 21:01:06 -04:00
Aronai Sieyes
19450573fe Fix condiment container infinite range 2020-05-04 20:24:54 -04:00
Aronai Sieyes
01a51e5acd Add prefs for Be Morph, Be Maintpred, Be Lost Drone 
Allows the 'never for this round' button to work, and for them to be disabled entirely if you don't want to be asked again.
 2020-05-04 20:04:43 -04:00
Aronai Sieyes
538e85283b Fix out-of-order role candidate options 
fixup pol commit
 2020-05-04 20:04:43 -04:00
Aronai Sieyes
3e45398a1d Fixes #7601 2020-05-04 18:19:46 -04:00
Aronai Sieyes
e24410ccce Merge pull request #7622 from VOREStation/aro-vitals 
Port Bay vitals monitors
 2020-05-04 16:49:52 -04:00
Cyantime
fe8878985b Allows dogborg barks to be disabled 2020-05-04 16:16:56 -04:00
Aronai Sieyes
aa17a98c77 Merge pull request #7626 from VOREStation/aro-ships 
Update ships, add ATTRIBUTIONS.md
 2020-05-04 14:49:06 -04:00
Aronai Sieyes
fabbdd8c8d Update ships, add ATTRIBUTIONS.md 2020-05-04 14:27:46 -04:00
Leshana
f93d50b034 Fix an overcharged smes from breaking charging on other smes. 
An overcharged smes could demand negative power from the grid, swamping other SMES and resulting in zero power being distributed.
 2020-05-04 13:36:53 -04:00
Aronai Sieyes
d8802c844c Merge pull request #7620 from VOREStation/aro-apcnight 
Allow locked APCs to still toggle night lighting
 2020-05-03 22:24:40 -04:00
Aronai Sieyes
9ecbb2feb1 Merge pull request #7619 from storesund98/master 
Aurora's floof, I mean fluff item
 2020-05-03 22:24:28 -04:00
Aronai Sieyes
216873f12d Port Bay vitals monitors 2020-05-03 22:18:19 -04:00
Aronai Sieyes
f270f276bc Allow locked APCs to still toggle night lighting 2020-05-03 21:13:17 -04:00
Steven Storesund
868d412d19 Aurora's floof, I mean fluff item 2020-05-03 19:44:13 -05:00
Aronai Sieyes
47d81e83b2 Merge pull request #7614 from VOREStation/aro-ssnightshift 
Port SSnightshift from Paradise
 2020-05-03 19:00:32 -04:00
Atermonera
77fef98789 Merge pull request #7010 from atlantiscze/2020_04_17_LoadBalancing 
Ports over power-related enhancements and tweaks i coded for Bay a while back
 2020-05-03 18:45:25 -04:00
Aronai Sieyes
aa6d22097b Port SSnightshift from Paradise 
Makes the station have a night mode.
 2020-05-03 17:51:05 -04:00
Aronai Sieyes
e8d1c964f3 Time datum fixes 2020-05-03 17:49:55 -04:00
Novacat
634b8e1ea8 Merge pull request #7607 from VOREStation/aro-slemfix 
Fix Xenobio Slimes
 2020-05-03 13:11:43 -04:00
Aronai Sieyes
23f398a72e Merge pull request #7598 from VOREStation/vplk-rpd 
Rapid Pipe Dispenser
 2020-05-03 13:07:59 -04:00
Aronai Sieyes
d81cc57ebf Merge pull request #7602 from KasparoVy/the-marked-one 
Adds 2 New Ears, a Tail & a Few Markings
 2020-05-03 13:05:22 -04:00
Aronai Sieyes
dac560cdf4 Fixy fix slems 2020-05-03 13:00:30 -04:00
Aronai Sieyes
ffb5c96eda General fix for spawning KO'd mobs 2020-05-03 12:59:24 -04:00
Novacat
d8633ba51f Merge pull request #7594 from VOREStation/upstream-merge-7069 
[MIRROR] Fix Temp check.
 2020-05-03 12:39:31 -04:00
Aronai Sieyes
2db976ca6c Update life.dm 2020-05-03 12:17:41 -04:00
Atermonera
3ff0557e43 Fix Temp check. 2020-05-03 12:17:28 -04:00
Aronai Sieyes
c07ff1ffc1 Merge pull request #7600 from VOREStation/vplk-overmap-ship-angle 
Overmap Ship Pixel Movement
 2020-05-03 12:14:41 -04:00
Aronai Sieyes
64b70bdd6d Merge pull request #7597 from VOREStation/aro-movetweak 
Improve various smooth movement things
 2020-05-03 12:10:59 -04:00
Novacat
5a8174c025 Merge pull request #7569 from VOREStation/upstream-merge-6960 
[MIRROR] Explorer Expansion: New Horizons
 2020-05-03 11:34:29 -04:00
Aronai Sieyes
f6394b0c6a Un-anger the byond demons even though this has been here for years 2020-05-03 11:25:29 -04:00
Unknown
1df25602c3 Poncho for mining 2020-05-03 10:08:19 -04:00
Novacat
b81a8388aa Merge pull request #7604 from VOREStation/upstream-merge-7043 
[MIRROR] Promethean Language
 2020-05-03 09:51:06 -04:00
Leshana
e1120409ac Respect buckle_movable 
- Only allow moving what you're buckled to of buckle_movable
- Fix buckle_movable values on some items.
 2020-05-03 09:49:25 -04:00
Leshana
57285beb6c MultiZ Pulling Fixes 
- Prevent pulling anchored stuff up stairs.
- Prevent pulling stuff up/down z-levels thru ladders.
 2020-05-03 09:49:25 -04:00
Unknown
2bce699cb2 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-6960 2020-05-03 09:47:45 -04:00
Unknown
9a156b4570 Travis fix 2020-05-03 09:40:35 -04:00
Atermonera
51741bebe8 Merge pull request #7058 from atlantiscze/2020_04_27_HardsuitBackpack 
Allows backpacks to be carried on most hardsuits
 2020-05-03 03:20:46 -04:00
Atermonera
23e72aa709 Merge pull request #7043 from MisterLayne/prommie-lang 
Promethean Language
 2020-05-03 03:14:21 -04:00
KasparoVy
eba6e230d1 Adds 2 New Ears, a Tail & a Few Markings 
Adds short/terrier & thin/jackal Vulpkanin ears (dual-colourable)
Adds a dual-colourable tail inspired by Ward-Takahaski cybernetics.
Adds a few markings:
--> Vulp Short Nose (shifted 1 pixel closer to the face in the east/west sprites)
--> Vulp Alt. Face (Vulpine facial hair but in marking form)
--> Taj Alt. Nose (Tajaran nose marking but colour mult & the same colour in all dirs)
--> Talons (Inspired by Ward-Takahashi Spirit markings)
--> Claws (Inspired by Ward-Takahashi Spirit markings)
 2020-05-03 02:25:21 -04:00
Leshana
fd1ed9bd85 Overmap Ship Pixel Movement 
- Moved ships to be in in SSprocessing so they get 1 second resolution.
- Add/remove ships from processing only when they are moving.
- Simulate pixel movement in code using pixel_x and pixel_y
 2020-05-02 22:24:03 -04:00
Leshana
32a8f8a455 Fixed build_overmap() to actually work. 2020-05-02 22:24:03 -04:00