cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,419 Commits 5 Branches 0 Tags
b98f849c824f11d55317165416c05df55386301c
Commit Graph

37607 Commits

Author SHA1 Message Date
Aronai Sieyes
b98f849c82 Merge pull request #7723 from VOREStation/aro-playtimedept 
Add department playtime requirement config, code
 2020-05-10 19:00:38 -04:00
Aronai Sieyes
11ad1fc274 Merge pull request #7737 from Rykka-Stormheart/shep-dev-steppies 
Add footstep sounds to almost every single tile.
 2020-05-10 18:55:06 -04:00
Novacat
5ba4dbc2d7 Merge pull request #7726 from VOREStation/upstream-merge-7110 
[MIRROR] adds logging variable to enable shuttle log spam
 2020-05-10 18:09:22 -04:00
Novacat
e9a15fcbeb Merge pull request #7740 from VOREStation/upstream-merge-7061 
[MIRROR] FloorTiles now properly show damage.
 2020-05-10 18:08:56 -04:00
Aronai Sieyes
a1e0ab0679 Merge pull request #7742 from VOREStation/aro-resleevedef 
Swap default response for resleeving prompt
 2020-05-10 17:58:51 -04:00
Aronai Sieyes
a1a4d4fd3a Merge pull request #7744 from TeleTubby2/CaribturChanges 
Multi_cannon changes.
 2020-05-10 17:58:42 -04:00
Aronai Sieyes
dfa6da6c7b Merge pull request #7748 from Rykka-Stormheart/shep-dev-hover-indicators 
Port over Hover Inventory and Body Zone Hover Indicator
 2020-05-10 17:57:59 -04:00
Aronai Sieyes
f856750f89 Merge pull request #7751 from VOREStation/aro-aijoinfix 
Fix AI roundstart join bug
 2020-05-10 17:52:24 -04:00
Aronai Sieyes
b5953f37e8 Merge pull request #7754 from Novacat/nova-shuttle 
Repurposes Explorer Corp Uniforms
 2020-05-10 17:49:13 -04:00
Aronai Sieyes
429fec6b6b Update floor_icon.dm 2020-05-10 17:41:56 -04:00
Aronai Sieyes
83316a51a6 Merge pull request #7756 from VOREStation/aro-vshubvis 
Alter VS hub visibility compiled in for TGS compat
 2020-05-10 15:20:19 -04:00
Aronai Sieyes
5546ed43e8 Alter VS hub visibility compiled in for TGS compat 2020-05-10 15:09:13 -04:00
Unknown
e76e1e3641 Some renaming oversights 2020-05-10 14:47:08 -04:00
Unknown
a74d890331 Repurposes Explorer Corp Uniforms 
Repurposes the SEV Torch Explorer Corp uniforms into uniforms for the Nanotrasen Defense Force.
 2020-05-10 14:44:15 -04:00
Aronai Sieyes
85204d4ff5 Adds a couple chat commands to tgs chatbot 2020-05-10 14:24:55 -04:00
Aronai Sieyes
933ce586c3 Fix AI roundstart join bug 2020-05-10 12:56:13 -04:00
Novacat
1d9879c7a0 Merge pull request #7734 from KillianKirilenko/kk-misc 
[LOADOUT] Dept. AR Glasses
 2020-05-10 12:42:35 -04:00
Novacat
ad5c1b9f25 Merge pull request #7738 from VOREStation/aro-bsflare 
Add bluespace flare to research designs
 2020-05-10 12:42:08 -04:00
Novacat
94ff4be6bd Merge pull request #7739 from VOREStation/upstream-merge-7132 
[MIRROR] Prevents simplemob spawning on random turfs, pending a better system.
 2020-05-10 12:26:03 -04:00
Novacat
60c0e7a24a Update grass.dm 2020-05-10 12:05:02 -04:00
Novacat
55d1c001d0 Update misc.dm 2020-05-10 09:03:45 -04:00
Rykka
dd187c900d Port over Hover Inventory and Body Zone Hover Indicator 
The body zone selector now indicates which body part you are about to select when hovered over, and the hover inventory indicator basically shows where you are trying to put an item, and then shows an item ghost in red or green, giving visual feedback as to if that item will go in the slot or not.

Gifs of this in action:
![https://i.imgur.com/MTi7Kpn.gif](https://i.imgur.com/MTi7Kpn.gif) Body Selection parts.

![https://i.imgur.com/KbLqWKy.gifv](https://i.imgur.com/KbLqWKy.gifv) 
Inventory Icon Overlays!

Credit goes to @ShadowLarkens for original port to Paradise and assistance with port to Virgo. Sending to Polaris ASAP.

- A note on `code/game/objects/items/weapons/storage/internal.dm`, VSCode automatically corrected the line endings, hence the massive filediff. The only practical changes are the addition of `disable_warning = 0`
 2020-05-10 07:29:53 -04:00
Rykka
90bc016390 Adds framework/backbone for TGS4 auto-update system 
Adds TGS4 from https://github.com/tgstation/tgstation-server to Virgo, allowing auto-update functionality and testmerges.

How well it runs depends on how @Arokha sets things up. :p
 2020-05-09 22:18:37 -04:00
Teletubby2
dc64755e52 ok 2020-05-09 19:49:02 -04:00
Aronai Sieyes
145480fe6f Swap default response for resleeving prompt 2020-05-09 19:16:22 -04:00
Atermonera
eafc97af69 FloorTiles now properly show damage. 2020-05-09 19:05:44 -04:00
Atermonera
5ed15f5636 Prevents simplemob spawning on random turfs, pending a better system. 2020-05-09 19:00:21 -04:00
Aronai Sieyes
215020e345 Add bluespace flare to research designs 2020-05-09 18:09:13 -04:00
Rykka
3d5bb56f8f Add footstep sounds to almost every single tile. 
Shuttle tiles, default floors are still "regular".
Lava, sand, water, grass, beach, mining turfs all have sounds playing now for each footstep. <3

Massive credit to @Arokha for helping me figure out the floor system and sitting through getting it put together. <3 <3 <3
 2020-05-09 17:40:14 -04:00
Aronai Sieyes
6021131272 Merge pull request #7736 from VOREStation/aro-langissues 
Fix various DM language issues
 2020-05-09 17:38:31 -04:00
Aronai Sieyes
bb24ce3c40 Fix weird stray commas 2020-05-09 16:54:14 -04:00
Aronai Sieyes
d1e7821b15 VS: Language issues 
These issues don't prevent compiling, but are strange issues nonetheless.
 2020-05-09 16:53:59 -04:00
Atermonera
7ecdd7e0b8 adds logging variable to enable shuttle log spam 2020-05-09 13:00:23 -04:00
Killian
f18191da1e Update loadout_eyes_vr.dm 2020-05-09 17:33:38 +01:00
Novacat
9c5f9bd08e Merge pull request #7728 from VOREStation/upstream-merge-7111 
[MIRROR] Fixes #7017
 2020-05-09 09:32:50 -04:00
Atermonera
f758879431 mechs trigger mines. They're not very effective... (#7113) 2020-05-09 04:27:48 -04:00
Atermonera
fc1b78d7f0 Fixes #7017 (#7111) 2020-05-09 04:26:23 -04:00
Aronai Sieyes
320ae99f68 Merge pull request #7722 from Verkister/moremobfixy 
Another bunch of simplemob fixes
 2020-05-08 19:39:19 -04:00
Aronai Sieyes
b9262c72f1 Make buildmode AI control reset home turfs when move orders given 2020-05-08 18:46:54 -04:00
Aronai Sieyes
ea8a068025 Add department playtime requirement config, code 2020-05-08 17:57:56 -04:00
Verkister
0ff0f19d0a better ways to do things 2020-05-08 23:47:30 +03:00
Aronai Sieyes
5a42a3a76e Merge pull request #7721 from VOREStation/upstream-merge-7099 
[MIRROR] Rewrite airlock electronics
 2020-05-08 16:07:26 -04:00
Verkister
a66eafb5cd Another bunch of simplemob fixes 
-Fixes the issue with mob AI not getting properly disabled under player control.
-Fixes mob eye overlays not respecting the mob's scaling setting.
-Fixes the movement cooldown on logged in ridable mobs.
-Fixes direwolf not getting belly icon when resting.
-Makes the mob icon fullness check account for the mob's own size as well.
 2020-05-08 22:54:11 +03:00
Aronai Sieyes
f8fa0c09cf Update airlock_electronics.dm 2020-05-08 15:53:32 -04:00
Atermonera
e02fc2550a Rewrite airlock electronics 2020-05-08 15:20:47 -04:00
Atermonera
40f1198e12 Merge pull request #7059 from atlantiscze/2020_04_28_DelamChange 
Supermatter delamination tweaks
 2020-05-08 15:18:27 -04:00
Aronai Sieyes
5f8ce48793 Merge pull request #7710 from VOREStation/upstream-merge-7064 
[MIRROR] Adds preference to control multilingual behaviour
 2020-05-08 14:55:46 -04:00
Aronai Sieyes
069b8829ad Update say.dm 2020-05-08 14:44:54 -04:00
Aronai Sieyes
7f29eef910 Merge pull request #7708 from VOREStation/upstream-merge-7101 
[MIRROR] Fixes Promethean Language
 2020-05-08 14:43:33 -04:00
Aronai Sieyes
92c3cf7345 Merge pull request #7706 from VOREStation/aro-holohear 
Prevent holopad chat from going to lobby
 2020-05-08 14:43:22 -04:00