cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-26 01:53:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,054 Commits 9 Branches 0 Tags
1ae322138bb00f3da45a3de1ee2ff36d113d7611
Commit Graph

24647 Commits

Author SHA1 Message Date
Aronai Sieyes
e0b119affc Merge pull request #7551 from VOREStation/aro-div0 
Further tweak move
 2020-04-30 21:53:53 -04:00
Aronai Sieyes
e59aeb02b5 Avoid div/0 in this. I'm not sure when that would happen. 2020-04-30 21:44:10 -04:00
Aronai Sieyes
d922ae018f Merge pull request #7545 from VOREStation/aro-clicks 
Fix some missed click check stuff
 2020-04-30 21:03:06 -04:00
Unknown
9c22a1847e More Gunbuster Fixes 2020-04-30 20:32:39 -04:00
Unknown
4dde4e4021 More Kisuke gun fixes 2020-04-30 20:12:11 -04:00
Aronai Sieyes
1eb7a7bc03 Fix some missed click check stuff 2020-04-30 19:33:23 -04:00
Aronai Sieyes
0afc02f4a3 Merge pull request #7541 from VOREStation/aro-talking 
Make humans sound good
 2020-04-30 18:42:39 -04:00
Aronai Sieyes
bed09d89b2 Merge pull request #7540 from ShadowLarkens/fix_emotes 
Formatting & Fixes for emotes (vhelp doesn't 'break' anymore)
 2020-04-30 18:42:01 -04:00
Aronai Sieyes
78e38a3b93 VS: protean blobs are synthetic bubbl 2020-04-30 18:40:13 -04:00
Aronai Sieyes
577fc584bb Make human speech bubbles more accurate 2020-04-30 18:39:59 -04:00
ShadowLarkens
46ba095d5a Formatting & Fixes for emotes (vhelp doesn't 'break' anymore) 2020-04-30 15:22:33 -07:00
Aronai Sieyes
351b3522bd Merge pull request #7534 from VOREStation/aro-moverework 
Rewrite client/Move() for smoother movement ingame
 2020-04-30 18:03:52 -04:00
Aronai Sieyes
62e5d5a413 Refactor client/Move 2020-04-30 15:46:51 -04:00
Aronai Sieyes
a0a3971449 VS: Stop adjusting cooldown directly 2020-04-30 15:44:19 -04:00
Aronai Sieyes
f5cbd8c35e Stop adjusting cooldown directly 2020-04-30 15:43:58 -04:00
Aronai Sieyes
a280d35970 VS: Clean up lastarea garbo 2020-04-30 15:43:08 -04:00
Aronai Sieyes
311c4e35df Clean up last_area garbo 2020-04-30 15:42:55 -04:00
Aronai Sieyes
1688e16d88 VS: Get your clicks out of my movement code 2020-04-30 15:41:26 -04:00
Aronai Sieyes
99fa98f437 Get your clicks out of my movement code 2020-04-30 15:40:41 -04:00
Leshana
10b0323d6f Use can_atmos_pass to reduce proc-calls in c_airblock() 
- Add additional can_atmos_pass value ATMOS_PASS_PROC which indicates custom behavior requiring calling the CanZASPass proc.
  - The benefit being for the other three values we DON'T need to call CanZASPass at all!  We already know the behavior without the overhead of a proc call.
  - Obviously any atom with can_atmos_pass = ATMOS_PASS_PROC cannot now call ..() in CanZASPass() since the default behavior would be to (recursively) call CanZASPass()
  - This required re-numbering the constants, so I also fixed all code that assumed particular values for the constants.
- Switched all types which overrode CanZASPass with custom logic to be can_atmos_pass = ATMOS_PASS_PROC
- Changed /turf/c_airblock() to skip calling /atom/movable/c_airblock() for the three can_atmos_pass values that don't require calling the proc.
 2020-04-30 14:50:57 -04:00
Leshana
4a2e8bb0c4 Fix return values of CanZASPass 
- CanZASPass is supposed to return boolean.  Nobody noticed this bug because ATMOS_PASS_YES and ATMOS_PASS_NO happen to be defined as 1 and 0.  But thats not a good assumption to make, so lets fix it!
 2020-04-30 14:50:57 -04:00
H0lySquirr3l
6691339d04 Add files via upload 2020-04-30 09:03:26 -05:00
Novacat
12c4a0df20 Merge pull request #7524 from Holdelta/HoundAdditions 
Adding: Hound borg models to Eng/Sci/Cargo, and two small additions.
 2020-04-30 09:43:35 -04:00
Unknown
49570f0d24 New Lore Oversights 
- Loads banners_vr
- Properly sets time back to 2320
 2020-04-30 09:11:08 -04:00
Holdelta
6b98b0bfa0 Adding: Hound borg models to Eng/Sci/Cargo, and two small additions. 
Adding a total of 6 recolored hound models, light and dark versions of the Medihound across Engineering, Science and Cargo.

Also, adding in *bark functionality for the dogborgs as a whole, as well as adding the bite module for the KMine.
 2020-04-29 20:01:37 -07:00
Aronai Sieyes
ee40c8c1bd Fix movement slow due to nutrition change 2020-04-29 22:17:39 -04:00
Novacat
3eaa2ad9fa Lore Overhaul (#7493) 
* Lore Overhaul

* Further Updates

* Changes the year

* Reverts unedited files adds Dragor's file

* Fixes compile error

* Spelling error

* Fixfix

* Comma fixes!

* Parenthesis fix

* Removes Virgov references

* Purges remnants of UC

* Recommended Change

* More consistent naming
 2020-04-29 19:59:03 -04:00
Aronai Sieyes
8ab8e3494e Merge pull request #7519 from VOREStation/aro-hetr 
Remove vorestation heterochromia since Polaris has it
 2020-04-29 19:24:06 -04:00
Aronai Sieyes
b3c1cfd29d Merge pull request #7516 from VOREStation/upstream-merge-7045 
[MIRROR] Removes limits on eating, centralizes nutrition changing.
 2020-04-29 19:23:55 -04:00
Novacat
81900f5080 Merge pull request #7505 from AmayaWah/pleasestop 
Adds Damon's bomber security jacket.
 2020-04-29 18:45:51 -04:00
Novacat
c70af70266 Merge pull request #7463 from Novacat/nova-ert 
Overhauls First Aid Kits
 2020-04-29 18:44:43 -04:00
Aronai Sieyes
b9c6107f26 Merge pull request #7513 from VOREStation/upstream-merge-7038 
[MIRROR] Rewrite examine() to pass a list around
 2020-04-29 18:38:26 -04:00
Aronai Sieyes
9d6082104d Remove vorestation heterochromia since Polaris has it 2020-04-29 18:36:48 -04:00
Aronai Sieyes
254af863c4 Merge pull request #7510 from VOREStation/upstream-merge-7016 
[MIRROR] Adds heterochromia, makes Teshari clothes recolorable (and footwraps)
 2020-04-29 18:35:21 -04:00
Aronai Sieyes
893130bdff Merge nutrition refactor for vorestation 2020-04-29 18:34:22 -04:00
Aronai Sieyes
874baa1d2d Merge examine refactor for vorestation 2020-04-29 17:49:54 -04:00
Atermonera
c3537b01e9 Merge pull request #7046 from Neerti/system_3_fixes 
Tweaks and fixes for the new new event system.
 2020-04-29 17:27:57 -04:00
Aronai Sieyes
077bcf49b9 Merge pull request #7514 from VOREStation/upstream-merge-7041 
[MIRROR] Slightly clean disposal pipe construction code.
 2020-04-29 17:20:43 -04:00
Atermonera
f1cabd6742 Removes limits on eating, centralizes nutrition changing. 2020-04-29 17:15:15 -04:00
Atermonera
c03d115089 Merge pull request #7042 from VOREStation/vplk-iconsheet-asset-cache 
Add "icon sheet" asset type
 2020-04-29 16:55:45 -04:00
Atermonera
84eb15f9cc Merge pull request #7041 from VOREStation/vplk-disposal-consts 
Slightly clean disposal pipe construction code.
 2020-04-29 16:52:26 -04:00
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Unknown
1048a969d4 Admin discussion changes 2020-04-29 15:23:01 -04:00
TheFurryFeline
3afe4adaed Remove Duplicate Code 
Title, response to mirror.
 2020-04-29 15:17:05 -04:00
Greenjoe12345
ff628daae1 Adds heterochromia for humanoid species and Teshari (#7016) 
adds the ability to color the Teshari undercoat, cloak, smock, as well as the footwraps
 2020-04-29 15:11:41 -04:00
Novacat
98574bf939 Merge branch 'master' into nova-ert 2020-04-29 14:29:09 -04:00
Aronai Sieyes
82a41c8d7a Merge pull request #7507 from VOREStation/aro-gravytopple 
Refine gravity generator FSM
 2020-04-29 14:13:57 -04:00
Aronai Sieyes
6cd52ff500 Merge pull request #7498 from VOREStation/aro-uav 
Adds UAVs
 2020-04-29 14:13:29 -04:00
Aronai Sieyes
390943784c Refine gravity generator FSM 2020-04-29 13:10:44 -04:00
Aronai Sieyes
ec0b316730 Merge pull request #7502 from VOREStation/aro-nogravyshuttle 
Have gravity generator ignore /area/shuttle
 2020-04-29 11:41:01 -04:00