cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-24 16:23:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,005 Commits 8 Branches 0 Tags
2b9c021f081fb2e4373ecce6b3777abbd10898a4
Commit Graph

24233 Commits

Author SHA1 Message Date
Matica
2b9c021f08 Ports YW's ears and wings 
Port's YW's big dragon horns, as well as their wings.
 2020-03-31 20:02:42 -04:00
Aronai Sieyes
91691bad85 Merge pull request #7061 from VOREStation/upstream-merge-6858 
[MIRROR] Port Bay's vendor/smartfridge sprites
 2020-03-31 17:41:13 -04:00
Aronai Sieyes
bf2b02aa34 VS: Tweak because of mining vendor sprite 2020-03-31 13:56:38 -04:00
Aronai Sieyes
9b07ee0a29 Mining equipment vendor use new vendor sprite 2020-03-31 13:56:38 -04:00
Aronai Sieyes
64b04c17af VS: Update maps for directional vendors 2020-03-31 13:56:38 -04:00
Unknown
dca2e93209 VS: Conflict Resolution + VS Changes 
Makes soft vendors work again
Conflict Resolution II
Fixes Shelter Capsule Vendor
Note to self remember quotations
Bad Lynx stop forgetting quotes!
 2020-03-31 13:56:38 -04:00
Atermonera
a23797182f Port Bay's vendor/smartfridge sprites 2020-03-31 13:56:38 -04:00
Novacat
1cdd572e6a Merge pull request #7060 from VOREStation/upstream-merge-6902 
[MIRROR] Convert alarm_manager into SSalarm subsystem.
 2020-03-31 11:45:08 -04:00
Amaya
99b50fe6ba line #70 edit 
from -> //Shifting in
	if(ability_flags & AB_PHASE_SHIFTED)
		ability_flags &= ~AB_PHASE_SHIFTED
		mouse_opacity = 2
to ->//Shifting in
	if(ability_flags & AB_PHASE_SHIFTED)
		ability_flags &= ~AB_PHASE_SHIFTED
		mouse_opacity = 1
 2020-03-31 16:30:37 +02:00
Aronai Sieyes
35448c5b53 Merge pull request #7054 from VOREStation/aro-sscleanup 
Clean up some subsystem things
 2020-03-30 21:07:17 -04:00
Aronai Sieyes
271a801abe Merge pull request #7055 from VOREStation/vplk-debug-master 
Debug Master Controller
 2020-03-30 21:07:03 -04:00
Aronai Sieyes
c794498259 Merge pull request #7056 from VOREStation/aro-shield 
Add shield remote button
 2020-03-30 21:06:51 -04:00
Aronai Sieyes
9a256b407f Merge pull request #7057 from VOREStation/vplk-bughunt 
Sundry Bugfixes XI
 2020-03-30 21:06:43 -04:00
Atermonera
8986eb7720 Merge pull request #6902 from VOREStation/vplk-ssalarm 
Convert alarm_manager into SSalarm subsystem.
 2020-03-30 20:41:10 -04:00
Leshana
48ee61f636 Avoid potential situation where log_debug calls to_chat which calls vchat_exec_update which calls log_debug. 2020-03-30 20:30:36 -04:00
Leshana
771c09ad2f Make attempt_vr print more complete debugging info/stack trace. 2020-03-30 20:30:36 -04:00
Leshana
2e114ede5c Fix error handler printing bogus src.loc and usr.loc info 2020-03-30 20:30:36 -04:00
Arokha Sieyes
b32c83250c Change VChat sqllite error message handler 2020-03-30 20:24:55 -04:00
Leshana
75d9bee4a0 Fixes Runtime in chemsmoke.dm,177: Cannot read null.seed_name 
- This was caused by create_spores() being called on seeds which were not registered with the plant_controller (becuase they had never been harvested)
- Instead of registering them, we can just pass the seed datum itself, that is all the chemsmoke needs anyway.
 2020-03-30 19:21:34 -04:00
Leshana
7f18d508ea Fixes Runtime in turf.dm,205: undefined variable /turf/simulated/floor/tiled/var/movement_type 
- Please do not call turf.Enter(another_turf).  My best guess is it wants to check the spread of a "cloud" of splatter, so air_canblock should be ok.
 2020-03-30 19:16:35 -04:00
Aronai Sieyes
060e48e597 Add shield remote button 2020-03-30 17:46:01 -04:00
Leshana
adec04c010 Fix Runtime in reagent_containers.dm,112: undefined proc or verb /mob/living/bot/farmbot/check mouth coverage(). 2020-03-30 17:39:34 -04:00
Leshana
1da5dd8230 Fix Runtime in unsorted.dm,1321: CANARY: Old human update_icons was called. 
At least the case of it being called from /datum/nifsoft/sizechange
No need to call update_icons() or even update_transform() because resize() does it for us.
 2020-03-30 17:17:26 -04:00
Leshana
e393b71dff Fixes Runtime in randomverbs.dm,134: list index out of bounds 2020-03-30 16:43:30 -04:00
Aronai Sieyes
cdb2336bf7 VS: Convert bellies to processing subsystem 2020-03-30 16:11:30 -04:00
Novacat
2f5044d9d0 Merge pull request #7031 from Novacat/nova-ert 
Spacesuit CitRP Port plus Refactor
 2020-03-30 13:21:09 -04:00
Aronai Sieyes
4f0d0a22f2 Merge pull request #7044 from Novacat/nova-pathfinder 
Ports Polaris #6924 and #6925
 2020-03-30 13:15:33 -04:00
Unknown
89d3a965f8 Ports a fix 2020-03-29 22:02:46 -04:00
Unknown
9f2d3f522d Ports Sniper Rifle QOL from Polaris 2020-03-29 21:36:27 -04:00
Unknown
31463d6770 Space Suit Refactor 2020-03-29 19:58:44 -04:00
Aronai Sieyes
4a77ea2fc5 Merge pull request #7043 from VOREStation/upstream-merge-6914 
[MIRROR] Fixes examine panel icons
 2020-03-29 18:17:27 -04:00
Novacat
0abd6bf8b3 Merge pull request #7041 from VOREStation/upstream-merge-6891 
[MIRROR] Fixes headphone offear
 2020-03-29 18:17:19 -04:00
Atermonera
bd31afc54f Fixes examine panel icons (#6914) 2020-03-29 18:02:51 -04:00
Atermonera
02d5f490ad Fixes headphone offear (#6891) 
* Fixes headphone offear breaking second ear slot when mousedropped

* Update clothing.dm
 2020-03-29 17:56:12 -04:00
Atermonera
f95db1f5bd Fixes slime enrage message (#6890) 
* /datum/ai_holder/simple_mob/xenobio_slime doesn't tell everyone it's angry

* non-red slimes still give big warning on enrage
 2020-03-29 17:54:46 -04:00
Aronai Sieyes
26a2a8504d Merge pull request #7020 from VOREStation/upstream-merge-6761 
[MIRROR] VChat: Redone chat output done in Vue.js
 2020-03-29 17:51:20 -04:00
Unknown
58f031cbf7 Converts webbing to Initialize 2020-03-29 16:17:34 -04:00
Aronai Sieyes
b2605300f2 Mergey Merge Polaris VChat 2020-03-29 15:37:43 -04:00
Aronai Sieyes
3e0e45468a Merge pull request #7019 from VOREStation/upstream-merge-6888 
[MIRROR] Port Overmap Skybox, Ships, Sectors, and Boats
 2020-03-29 15:33:49 -04:00
InterroLouis
f87e63f95a Delete ore_datum_vr.dm 2020-03-29 13:48:09 -04:00
Aronai Sieyes
7bd074d975 Merge pull request #7023 from VOREStation/upstream-merge-6900 
[MIRROR] Converted old supply_controller to SSsupply
 2020-03-27 22:33:53 -04:00
Aronai Sieyes
b78cdf7b64 Merge pull request #7026 from ShadowLarkens/admin_utilities_and_niceities 
Added three utilities for admins & developers
 2020-03-27 22:30:21 -04:00
ShadowLarkens
c44553c9d5 Added three utilities for admins & developers 
- There is a new option in the player panel labeled "Send back to
   Lobby", which will send a given player back to the lobby.
 - The player panel also has a shortcut to the "Spawn Character" verb.
 - Finally, there's a new config option that disables the warning
   message about multikeying if two mobs with the same CID are found;
   this option should NOT be enabled if multikeying is prohibited by the
   server rules. It is simply a developer tool, as multikeying is
   sometimes necessary to test new features that require two clients
   interacting.
 2020-03-27 15:41:44 -07:00
TheFurryFeline
1045a56bb3 Look, Ma! More Typo Fixing! 
Title, Affectionally -> Affectionately

Changelog Notes:

- Fixes borgs' licking adjective's, or whatever's, spelling.
 2020-03-27 18:33:21 -04:00
Novacat
8c7424b3e8 VOREStation specifics for SSsupply refactor. 
Update vorestation.dme
 2020-03-27 18:28:21 -04:00
Leshana
3ac3641b79 Spelling corrections. 2020-03-27 18:11:39 -04:00
Leshana
ff0fe0ef86 Let all ferry shuttles ignore docking codes. 
Ferry shuttles generally shouldn't have to worry about docking codes.  Thats for exploration or antag shuttles. Therefore let them read the docking codes and dock anyway.
Given we put this on all ferry shuttles, we don't need specific code for it on the supply shuttle anymore.
 2020-03-27 18:08:16 -04:00
Leshana
f6835c639a Mark VOREStation edits 2020-03-27 18:08:12 -04:00
Atermonera
752d560d76 Converted old supply_controller to SSsupply 2020-03-27 17:38:05 -04:00
Aronai Sieyes
2c761ec367 Extra overmaps for adminbuse and bluespace rifts 2020-03-27 17:25:16 -04:00