cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-26 17:24:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,328 Commits 8 Branches 0 Tags
2eae0fdecbcf435b4e8978e3b3e842afa5fd1178
Commit Graph

36338 Commits

Author SHA1 Message Date
Novacat
2eae0fdecb Merge branch 'master' into upstream-merge-6762 2020-03-09 01:45:23 -04:00
Novacat
70ce4a2797 Update world.dm 2020-03-09 01:31:07 -04:00
Novacat
f6b72c9997 Update subsystems.dm 2020-03-09 01:27:06 -04:00
Novacat
1b5fcc052c Update misc.dm 2020-03-09 01:26:36 -04:00
Arokha Sieyes
32ccb0901a Port Bay's inactivity subsystem 2020-03-09 00:53:31 -04:00
Aronai Sieyes
b849ff90a2 Merge pull request #6785 from VOREStation/aro-DELETEWHENMERGED 
Fix missing incorporeal floatyness
 2020-03-08 17:53:15 -04:00
Atermonera
51d74bc25b Merge pull request #6793 from Cerebulon/emlocksprite 
Fixes shuttle emergency locker sprites
 2020-03-08 16:22:34 -04:00
Aronai Sieyes
0500515a41 Fix missing incorporeal floatyness 2020-03-08 15:47:36 -04:00
Novacat
6eb9b4faf6 Merge pull request #6780 from VOREStation/upstream-merge-6767 
[MIRROR] Exosuit Expansion: Return of the Ripley
 2020-03-08 12:31:50 -04:00
Novacat
3c06d62345 Update weldingtool.dm 2020-03-08 03:25:18 -04:00
Novacat
893ed0572d Merge pull request #6779 from VOREStation/aro-pregameconf 
Makes pregame time a config setting
 2020-03-08 01:48:04 -05:00
Mechoid
acc712e1d5 Exosuit Expansion: Return of the Ripley 2020-03-08 00:52:32 -05:00
Aronai Sieyes
72f239b2ac Makes pregame time a config setting 
Boo hardcoded values
 2020-03-08 01:05:28 -04:00
Novacat
c91a7a8e02 Merge pull request #6662 from VOREStation/SpadesNeil-patch-1 
Attempts to fix Panslavic, again.
 2020-03-07 14:48:22 -05:00
Spades
8526f8582c Update station_vr.dm 2020-03-06 22:23:32 -05:00
Spades
04143d01a8 Update station_vr.dm 2020-03-06 19:32:10 -05:00
Aronai Sieyes
632d3a8dc5 Merge pull request #6773 from VOREStation/aro-blufo 
Random stuff for map use/events
 2020-03-06 13:14:37 -05:00
Arokha Sieyes
3f782d1ea2 Sprites 'n stuff 2020-03-06 13:03:53 -05:00
Aronai Sieyes
7e848e90fc Merge pull request #6772 from VOREStation/aro-blufo 
Various minor things
 2020-03-06 09:58:00 -05:00
Aronai Sieyes
183b4ae328 Merge pull request #6767 from Cyantime/patch-2 
Change chat export naming scheme
 2020-03-05 23:43:39 -05:00
Aronai Sieyes
1255e1be77 Hybrid shuttle 2020-03-05 23:30:07 -05:00
Aronai Sieyes
c9f7465ee2 Touch up bed/chair/stool icon updating 2020-03-05 23:30:07 -05:00
Aronai Sieyes
6122295f2f Improve SMES icon handling 2020-03-05 23:30:07 -05:00
Aronai Sieyes
c70e974dd0 Powernet cable nodes work on shuttles 2020-03-05 23:30:07 -05:00
Aronai Sieyes
4b5069582b Sprites for alien and frontier translocators 2020-03-05 23:30:07 -05:00
Aronai Sieyes
4bfbb99356 Brighter permanent light 2020-03-05 23:20:58 -05:00
Novacat
6e23c5f45a Merge pull request #6709 from VOREStation/aro-mistake 
Fix way too many vorestation edits
 2020-03-05 19:03:58 -05:00
Novacat
efdb9c9340 Merge pull request #6770 from VOREStation/upstream-merge-6789 
[MIRROR] Moving AI busy check so it's performed less and more centrally
 2020-03-05 17:58:50 -05:00
Atermonera
217dabd31c Merge pull request #6789 from VOREStation/pol-busysignal 
Moving AI busy check so it's performed less and more centrally
 2020-03-05 15:14:36 -05:00
Atermonera
3454a5dd61 Merge pull request #6787 from VOREStation/pol-latchto 
Trains try to talk to nobody on init
 2020-03-05 15:13:22 -05:00
Cyantime
0280f73ea3 Change chat export naming scheme 
Filename is now sortable alphabetically for chronological order, approximates default byond log name scheme.
 2020-03-05 14:21:48 -05:00
Aronai Sieyes
42dc591215 Merge pull request #6756 from VOREStation/vplk-shuttles 
Landmark Shuttles
 2020-03-05 13:34:56 -05:00
Novacat
4c8e0b0d73 Merge pull request #6760 from VOREStation/aro-vchatpingy 
Some VChat Tweaks
 2020-03-05 13:34:49 -05:00
Novacat
7e0849f084 Merge pull request #6765 from VOREStation/aro-wet 
Water -> Wet
 2020-03-05 13:34:29 -05:00
Novacat
756034f1dd Merge pull request #6763 from VOREStation/aro-vchatexportdate 
Include date in filename for VChat log save
 2020-03-05 13:34:12 -05:00
Arokha Sieyes
5b93fe9f10 Water -> Wet 2020-03-05 13:23:01 -05:00
Arokha Sieyes
5b395e8492 Include date in filename for VChat log save 2020-03-05 12:55:18 -05:00
Arokha Sieyes
b1728c5520 Refactor sleevemate 
Allows keeping OOC notes between download/upload of mobs
 2020-03-05 12:24:48 -05:00
Leshana
ff92e661c7 Add upgrade mapping guide. 2020-03-05 10:29:10 -05:00
Aronai Sieyes
db35a6ec53 Tether map conversion to use landmark shuttles. 
- Updated shuttle datums according to the guide.
- Removed the extra shuttle areas and replaced with shuttle landmarks.
- Updated some custom code.
 2020-03-05 10:29:10 -05:00
Leshana
c837078105 Replaced "area" shuttles with "landmark" shuttles. 
Largely ported from the work done at Baystation in https://github.com/Baystation12/Baystation12/pull/17460 and later commits.

 - Shuttles no longer require a separate area for each location they jump to.
   Instead destinations are indicated by landmark objects, which are not necessarily exclusive to that shuttle.
   This means that more than one shuttle could use the same docking port (not at the same time of course).
 - Enhanced shuttle control computers to use nanoui if they didn't.
 - Organizes shuttle datum code a bit better so there is less re-inventing the wheel in subtypes.
 - Allows the possibility of shuttles (or destinations) that start on late-loaded maps.
 - Deprecate the "extra" shuttle areas that are no longer needed and update shuttle areas in unit tests

This all required a bit of infrastructure improvements.

 - ChangeArea proc, for changing the area of a turf.
 - Fixed lighting overlays actually being able to be destroyed.
 - Added a few utility macros and procs.
 - Added "turf translation" procs which are like move_contents_to but more flexible.
 2020-03-05 10:29:08 -05:00
Aronai Sieyes
dafd19c708 Some VChat Tweaks 
- Chat remains between client reconnects if your client didn't close (so things like using the reconnect button, or autoreconnects at round end when that feels like working)
- The client doesn't send pings to the server, the server sends pings to the client. This fixes AFK measurements for AFK kick purposes.
- Turn latency indicator into a green/red indicator to show if you're connected, and when clicked will perform a one-time ping (and block doing it again for 10 seconds). It will display '?ms' if it never got a reply, or '999ms' if it did, but it was over 1s.
 2020-03-04 20:53:35 -05:00
Novacat
dd97363b8b Merge pull request #6750 from VOREStation/upstream-merge-6778 
[MIRROR] Let them finally eat cake
 2020-03-03 17:53:05 -05:00
Neerti
0d9345adde Half-Refactors Jobs 2020-03-03 16:28:33 -05:00
Novacat
d3489521d4 Merge pull request #6742 from VOREStation/aro-vchatspeed 
VChat Improvements
 2020-03-03 16:16:50 -05:00
Novacat
f63fa398b9 Update thecake.dm 2020-03-03 16:15:54 -05:00
Schnayy
7bee18a2d7 Let them finally eat cake 2020-03-03 15:57:10 -05:00
Heroman3003
dd8f1f6d2b Fixes sofa not refunding any material (#6784) 2020-03-03 15:54:54 -05:00
Novacat
c9f77d563f Merge pull request #6745 from VOREStation/upstream-merge-6774 
[MIRROR] Sprite fixes
 2020-03-03 02:11:54 -05:00
Novacat
440a739ef9 Merge pull request #6744 from VOREStation/upstream-merge-6772 
[MIRROR] Fixes a teshari mining undercoat
 2020-03-03 01:51:05 -05:00