cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,446 Commits 10 Branches 0 Tags
264793b36a13e400f7224337055df04dcc1b915a
Commit Graph

38835 Commits

Author SHA1 Message Date
ShadowLarkens
264793b36a Fading titlescreen from /tg/ 2020-08-25 16:50:23 -07:00
Novacat
a69e94f948 Merge pull request #8519 from KillianKirilenko/kk-misc2 
Explorer/Pathfinder Belts
 2020-08-25 17:15:14 -04:00
Novacat
b5c884eb03 Merge pull request #8825 from ShadowLarkens/tgui_research_rebased 
TGUI Research
 2020-08-25 17:12:24 -04:00
Novacat
7ae5bf301b Merge pull request #8819 from dwinters99/gutterband 
Changes Gutter to Gutterband, removes whitelist.
 2020-08-25 16:38:06 -04:00
Novacat
0ef6772c9b Merge pull request #8823 from cadyn/cadyn-bugfixes 
Couple bugfixes
 2020-08-25 16:37:30 -04:00
ShadowLarkens
097d4fa283 TGUI Research 2020-08-25 13:30:47 -07:00
Atermonera
3669657656 Fixes Runtime in vchat_client.dm,85: Cannot execute null.is preference enabled (#7557) 2020-08-25 00:32:25 -04:00
Cadyn
f18c075cfd Feedback and forgot the VS edit goodies 2020-08-23 20:41:03 -07:00
David Winters
42f2b58b25 Moved name change to define, removes legacy entries from alienwhitelist 2020-08-23 23:31:31 -04:00
Cadyn
0d0cd61e60 Yummy bugfixes 2020-08-23 20:24:04 -07:00
Novacat
6d9968adba Merge pull request #8822 from Rykka-Stormheart/shep-dev-merc-retaliate 
Fixes Mercs threaten timers, and threaten sounds
 2020-08-23 21:23:10 -04:00
Rykka
0014833e89 Fixes Mercs threaten timers, and threaten sounds 
The default "threaten" timer was 3 seconds, meaning that as soon as world.time advanced beyond that, the merc would shoot you. If there's TIDI/lag or other issues, you'd immediately end up getting shot.

30 seconds is more reasonable, allows you time to back away from the merc without being shot at, and it keeps the mercs from being cheesed easily.

This also fixes the merc aggression sounds. Actual voicelines incoming once I get help from a contributor!
 2020-08-23 18:47:02 -04:00
Novacat
cb125004dc Merge pull request #8818 from Rykka-Stormheart/shep-dev-portalize-tether 
Converts Step_triggers to Portals!
 2020-08-23 16:40:29 -04:00
ShadowLarkens
0ac5a2e020 Vore panel list preference 2020-08-23 13:03:00 -07:00
ShadowLarkens
ac03887a55 Merge remote-tracking branch 'upstream/master' into vore_overlays 2020-08-23 10:39:55 -07:00
Novacat
8301f7832d Merge pull request #8363 from KillianKirilenko/kk-misc 
AR Glasses Tweaks
 2020-08-23 13:14:37 -04:00
ShadowLarkens
6d4adf0764 Allows you to right click to lower job preference 2020-08-23 08:27:55 -04:00
David Winters
770cd596d9 Unwhitelist 2020-08-23 07:20:12 -04:00
Novacat
9774efc116 Merge pull request #8811 from ShadowLarkens/fix_asset_cache_runtime 
"Fix" asset cache json runtime
 2020-08-22 20:39:51 -04:00
Rykka
c71dba5cae Converts Step_triggers to Portals! 
Implements Portal Functionality to replace the older step_triggers!

Z-level transitions are now 99.9% seamless!

It's self-explanatory, images below in editor:
![](https://i.imgur.com/EBr9mnN.png)
![](https://i.imgur.com/lP0UQxT.png)
![](https://i.imgur.com/c6VX1EC.png)
![](https://i.imgur.com/dfqDz75.png)
![](https://i.imgur.com/pUNVmBG.png)

In-game Version:
To Surface Mining:
![](https://i.imgur.com/aoJIwps.png)
![](https://i.imgur.com/nqVCYV9.png)
To Solars:
![](https://i.imgur.com/FRb6ZKB.png)
To Plains/Wilderness:
![](https://i.imgur.com/Y8kf40k.png)
 2020-08-22 20:36:49 -04:00
Cyantime
ae94023362 Patches potential maybe-exploit in bomb simulator 2020-08-22 19:21:11 -04:00
ShadowLarkens
0c65f751fa "Fix" asset cache json runtime 2020-08-22 14:13:48 -07:00
Kates
8a138ee94e Add a zero to the translocator. 2020-08-22 22:48:32 +02:00
lbnesquik
472685cd25 Correct price errors introduced in UI update. Also shuffle a few things so there is no random spaces in the vendor. 2020-08-22 20:36:21 +02:00
Novacat
9b802e87f9 Merge pull request #8805 from VOREStation/upstream-merge-7526 
[MIRROR] Fixes mobs being able to ventcrawl while buckled
 2020-08-22 09:23:33 -04:00
Novacat
8df4b70b00 Merge pull request #8804 from VOREStation/upstream-merge-7530 
[MIRROR] Disables Swarmer Drones
 2020-08-22 09:23:20 -04:00
Novacat
3b5fd1a52f Merge pull request #8802 from VOREStation/upstream-merge-7536 
[MIRROR] Fixes a copypaste slip with heat protection
 2020-08-22 09:23:05 -04:00
Novacat
307793ba10 Merge pull request #8801 from VOREStation/upstream-merge-7532 
[MIRROR] Makes unbreakable walls unacidable
 2020-08-22 09:22:50 -04:00
Verkister
138a05c2a8 Fixes mobs being able to ventcrawl while buckled (#7526) 
No more mice teleporting office chairs all over the station.
 2020-08-22 04:24:31 -04:00
Neerti
205aef2e07 Disables Swarmer Drones (#7530) 
I actually forgot to do this before the event system went permanently live so that's on me.
Anyways this turns off swarmer drones from being able to be picked by the GM system, since right now they're, to put it charitably, poorly balanced and implemented (being super-maint drones is very clunky to me but thats not the main thing).
When the GM system spawns one in, it tends to result in a ghost becoming the drone, then that player essentially never being able to lose due to infinite re-tries and the crew has to fight off drones for the rest of the round or until they or the drone gets bored.
There's been quite a few number of rounds that have devolved due to them so for now it's probably best to turn them off for the time being.
 2020-08-22 04:24:20 -04:00
Verkister
f511641363 Fixes a copypaste slip with heat protection (#7536) 
Found while digging around for something else
 2020-08-22 04:12:32 -04:00
Cyantime
d8dcc61ea5 Makes unbreakable walls unacidable (#7532) 2020-08-22 04:11:17 -04:00
Novacat
9e60838354 Update occupation.dm 2020-08-22 01:48:52 -04:00
Atermonera
4097a3c765 Allows you to right click to lower job preference 2020-08-22 01:41:52 -04:00
Novacat
87f2c0c594 Merge pull request #8798 from VOREStation/upstream-merge-7484 
[MIRROR] Adds Repeating Ambience and Ambience Chance Preferences!
 2020-08-22 00:47:08 -04:00
Novacat
d4832478e2 Merge pull request #8799 from VOREStation/upstream-merge-7478 
[MIRROR] Ports borg petting from CHOMPStation
 2020-08-22 00:24:41 -04:00
Novacat
e2a8446396 Update robot.dm 2020-08-21 23:34:19 -04:00
Novacat
405ca5c158 Merge pull request #8797 from Heroman3003/ahelpfeed 
Replace another instance of IRC with Discord in ahelp verb feedback messages
 2020-08-21 23:32:38 -04:00
Atermonera
3c67a19a20 Ports borg petting from CHOMPStation 2020-08-21 23:32:15 -04:00
Novacat
84f16fecc2 Update 01_ui.dm 2020-08-21 23:32:07 -04:00
Atermonera
325afb857e Adds Repeating Ambience and Ambience Chance Preferences! 2020-08-21 23:30:59 -04:00
Heroman3003
34eb48c770 Replace another instance of IRC with Discord in ahelp verbs 2020-08-22 12:13:10 +10:00
Novacat
c314578ed3 Merge pull request #8786 from Meghan-Rossi/lathefix 
Fixes duplicate autolathe entries+lets you batch-print carafes+pitchers
 2020-08-21 17:16:44 -04:00
Novacat
25e369e173 Merge pull request #8656 from serenekerosene/VOREstation 
Less wind per wind Correct Edition
 2020-08-21 17:13:12 -04:00
Novacat
6dd814c4d6 Merge pull request #8725 from dwinters99/flintlock_jacket 
Flintlock's jacket
 2020-08-21 17:12:31 -04:00
Novacat
16465b5618 Merge pull request #8728 from VOREStation/upstream-merge-7466 
[MIRROR] Adds wearing cones and caution signs
 2020-08-21 13:33:08 -04:00
Novacat
ab88747252 Merge pull request #8755 from VOREStation/upstream-merge-7452 
[MIRROR] Gives FBP's a proc to change their monitor display without using a mask item.
 2020-08-21 13:32:51 -04:00
Novacat
a6efe9acbb Merge pull request #8756 from VOREStation/upstream-merge-7449 
[MIRROR] Flavour Enhancement: Vending
 2020-08-21 13:32:37 -04:00
Novacat
4082d5355b Merge pull request #8785 from VOREStation/upstream-merge-7523 
[MIRROR] Ghost sechud verb, shift-click examine, alt-click turf tab
 2020-08-21 13:32:20 -04:00
Novacat
1b27dffb9d Merge pull request #8757 from VOREStation/upstream-merge-7445 
[MIRROR] FBP Internal Components
 2020-08-21 13:32:02 -04:00