cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,416 Commits 10 Branches 0 Tags
31f7f5b256e15c45c8ad2d94fa672a0fe344e466
Commit Graph

36961 Commits

Author SHA1 Message Date
Aronai Sieyes
31f7f5b256 Fix shuttles not updating skybox 2020-04-14 17:31:32 -04:00
Aronai Sieyes
d21535a232 Merge pull request #7252 from VOREStation/aro-talontweaks2 
More ship tweaks
 2020-04-14 14:06:07 -04:00
Leshana
8527736ab6 Revert "Okay this was not a good change" 
This reverts commit 569723547c.
 2020-04-14 13:21:20 -04:00
Leshana
45c591e6f7 Revert "Debugging code to determine if Master failures actually happen while firing a subsystem." 
This reverts commit 3e9c17c1c0.
 2020-04-14 13:21:20 -04:00
Aronai Sieyes
20ed63594d Update point defense sprites and power usage 2020-04-14 13:19:21 -04:00
Aronai Sieyes
857c0cfd6f New 'emblem' flooring decals for ships/factions 2020-04-14 11:03:49 -04:00
Aronai Sieyes
da6c649e50 VS: Universal technomancer cores 2020-04-13 22:35:13 -04:00
Aronai Sieyes
4cfea4302d Technomancer mark sprite 2020-04-13 22:35:13 -04:00
Novacat
b81df6c72b Merge pull request #7241 from VOREStation/aro-moretalon 
Slight beach island improvement
 2020-04-13 18:05:42 -04:00
Novacat
13353294f2 Merge pull request #7239 from Heroman3003/headband-maid 
Adds maid headband to loadout
 2020-04-13 18:04:29 -04:00
Novacat
c076f3cb16 Merge pull request #7240 from Heroman3003/azuchifix 
Fixes Azura's collar
 2020-04-13 18:04:10 -04:00
Leshana
997204960c Spawn statistic_cycle off to not sleep SSticker. 2020-04-13 17:38:12 -04:00
Aronai Sieyes
717acacba4 Beachyness 2020-04-13 17:36:15 -04:00
Heroman
fa5422cc63 Adds a comment for future 2020-04-14 07:27:44 +10:00
Heroman
87a65a09c6 Fixes Azura's collar 2020-04-14 07:16:31 +10:00
Heroman
2073af57f1 Adds maid headband to loadout 2020-04-14 06:48:18 +10:00
Aronai Sieyes
9b3f19f51f Merge pull request #7235 from VOREStation/aro-talontweaks 
Various little Talon tweaks and fixes
 2020-04-13 15:47:46 -04:00
Aronai Sieyes
2e62158884 Make more turfs blend 2020-04-13 15:04:36 -04:00
Unknown
4238aabcb8 Fixes broken netgun sprite 2020-04-13 13:41:56 -04:00
Aronai Sieyes
d5d0d98163 Merge pull request #7232 from VOREStation/aro-talonpref 
Talon job pref saving
 2020-04-13 11:31:56 -04:00
Aronai Sieyes
e3a6def6f7 Remove cursed file 2020-04-13 11:18:39 -04:00
Aronai Sieyes
9368dd2736 Talon job pref saving 2020-04-13 11:05:27 -04:00
Unknown
5468301dc5 Ports Polaris 6992 and some Urist backpacks 
- Reenables Dual Wielding penalties on most heavy guns.
- Adds wielded sprites for all weapons with dual-wield penalties.
- Ports a ton of gun sprites from Urist McStation
- Removes mention of requires_two_hands in code since that is not used anymore.
- Adds some Urist mcstation backpacks (VS only)
 2020-04-13 10:40:24 -04:00
Aronai Sieyes
68b527b518 Merge pull request #7222 from VOREStation/aro-shieldbeep 
Make shield sprites look nicer hopefully
 2020-04-13 10:05:27 -04:00
Aronai Sieyes
b1bf1a7e93 Merge pull request #7211 from VOREStation/vplk-shuttle-construction 
Ship/Shuttle Console Construction
 2020-04-13 10:01:56 -04:00
Aronai Sieyes
074116fa7c Merge pull request #7212 from Novacat/nova-pathfinder 
Gun Refactors and Changes
 2020-04-13 09:45:37 -04:00
H0lySquirr3l
5bc18c4c96 Replace ring in holo boxing ring with actual ring. (#7209) 
* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Delete fitness_vr.dmi

* Add files via upload
 2020-04-13 09:33:22 -04:00
Aronai Sieyes
d9b3739669 Merge branch 'master' into vplk-shuttle-construction 2020-04-13 09:30:05 -04:00
Aronai Sieyes
a7590e81a9 Merge pull request #7210 from VOREStation/aro-shuttleiocn 
Changes shuttle landing soon warning
 2020-04-13 09:28:53 -04:00
Aronai Sieyes
0d39c5535e Merge pull request #7200 from VOREStation/aro-offmap-rebase2 
ITV Talon offmap spawn jobs
 2020-04-13 09:28:19 -04:00
Novacat
2c1030b3e6 Merge pull request #7224 from VOREStation/upstream-merge-6878 
[MIRROR] A Tale of Blobs and Man
 2020-04-13 08:14:41 -04:00
Novacat
ee4ca5aa52 Update spore.dm 2020-04-13 07:31:19 -04:00
Novacat
84dfedd34c Merge pull request #7223 from MrSign/kittywhitelist 
Adds K't's fishing rod whitelist
 2020-04-13 07:29:57 -04:00
Novacat
7b66fa010d Merge pull request #7227 from VOREStation/upstream-merge-6986 
[MIRROR] Fix manifold and manifold4w underlay rendering.
 2020-04-13 07:29:18 -04:00
Atermonera
5308c2a6b3 Merge pull request #6989 from VOREStation/pol-blast 
Random blast door fix
 2020-04-13 02:22:26 -04:00
Atermonera
714dce67c3 Merge pull request #6986 from VOREStation/vplk-fix-manifold-underlays 
Fix manifold and manifold4w underlay rendering.
 2020-04-13 02:19:08 -04:00
Atermonera
2374a40908 A Tale of Blobs and Man 2020-04-13 01:35:01 -04:00
MrSign
0da3c94d09 Update loadout_fluffitems_vr.dm 2020-04-13 13:14:19 +10:00
Aronai Sieyes
a727b703b6 Merge pull request #7207 from Runa-Dacino/Horned-elves 
Adds new ear options
 2020-04-12 23:00:40 -04:00
Aronai Sieyes
a8402f0df1 Merge pull request #7216 from VOREStation/upstream-merge-6966 
[MIRROR] Refactor away area/New()
 2020-04-12 22:56:50 -04:00
Aronai Sieyes
b28f08de4d VS: NIF crew monitor update 2020-04-12 22:53:18 -04:00
Aronai Sieyes
2097e329ac Add some wall types 2020-04-12 22:53:09 -04:00
Aronai Sieyes
4e0a62996b Add nav console modular program and fix crew mon bug 2020-04-12 22:52:57 -04:00
Aronai Sieyes
984415e9c9 Merge pull request #7177 from VOREStation/sscleanup/openspace 
Refactor the Open Space controller into MC Subsystem
 2020-04-12 21:55:20 -04:00
Leshana
5a6d7f9184 Fixes and bubble shield visuals support. 2020-04-12 21:02:45 -04:00
Aronai Sieyes
ba20f079f2 Fix startends 2020-04-12 20:51:07 -04:00
Aronai Sieyes
3a41cf0656 Make shield sprites look nicer hopefully 2020-04-12 20:51:07 -04:00
Leshana
865303e481 Removed area.uid var and /area/New() 
- var/uid was used in only a handful of places.  Because areas are singletons
  it is safe to replace the uid with \ref, areas don't get deleted.
- And with that /area/New() is empty, we can remove it!
 2020-04-12 18:05:09 -04:00
Leshana
262faa38e4 Replace global all_areas list with world. 
It ends up having similar performance, so might as well not bother with all_areas.
 2020-04-12 18:04:54 -04:00
Leshana
859036b7cd Merge pull request #7176 from VOREStation/vplk-glass-firedoors 
Make glass firedoors constructable/deconstructable.
 2020-04-12 11:51:46 -04:00