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
50,612 Commits 10 Branches 0 Tags
2e23dcdb492eabaf0d057bc73f8f61362166cb9e
Commit Graph

36499 Commits

Author SHA1 Message Date
ShadowLarkens
2e23dcdb49 Speed up mapload significantly 
Co-authored-by: Aronai Sieyes <arokha@arokha.com>
 2020-03-19 00:29:24 -04:00
Aronai Sieyes
9250685a06 VS-specific changes for mapload time 2020-03-19 00:27:47 -04:00
Aronai Sieyes
32b68a17c6 Merge pull request #6903 from VOREStation/aro-miscchanges 
Move most antag things to admin-loadable maps
 2020-03-18 11:52:26 -04:00
Aronai Sieyes
9873ad8fc7 Merge pull request #6904 from VOREStation/upstream-merge-6839 
[MIRROR] Streamline Job Alt Titles
 2020-03-18 11:14:20 -04:00
Aronai Sieyes
fcd91a14d5 Update _vr files for changes to alt titles 2020-03-18 10:59:27 -04:00
Aronai Sieyes
30deeb2011 Re-remove assistant alt titles 2020-03-18 10:06:05 -04:00
Aronai Sieyes
fc581e151f Merge pull request #6907 from VOREStation/upstream-merge-6773 
[MIRROR] Cutting rigs now retracts all components, to stop the dreaded pseudoprison.
 2020-03-18 09:58:04 -04:00
Aronai Sieyes
2c88a4df7f Merge pull request #6845 from VOREStation/aro-sectors 
Sector tweaks
 2020-03-18 09:53:20 -04:00
Novacat
01b54f0952 Update rig.dm 2020-03-18 09:22:16 -04:00
Novacat
ae63f7b091 Merge pull request #6905 from VOREStation/upstream-merge-6853 
[MIRROR] Makes holsters and webbing get along.
 2020-03-18 09:21:43 -04:00
Atermonera
735f3a9e4a Cutting rigs now retracts all components, to stop the dreaded pseudoprison. 2020-03-18 04:11:32 -04:00
Atermonera
f28dcdb2d4 Merge pull request #6855 from Schnayy/newterrain 
POI wall nonsense
 2020-03-18 04:10:18 -04:00
Atermonera
20a9f6463b Merge pull request #6853 from Neerti/holsters_and_webbing 
Makes holsters and webbing get along.
 2020-03-18 03:31:49 -04:00
Atermonera
2ea86bbf07 Streamline Job Alt Titles 2020-03-18 03:15:04 -04:00
Aronai Sieyes
458212ac29 Correctly create circulation cus cats can't cope 2020-03-18 02:06:28 -04:00
Aronai Sieyes
4ad035b16d Move most antag things to admin-loadable maps 2020-03-18 01:27:29 -04:00
Andrew
f043c8e42e Helmet Camera Verb No Longer Shows Without Helmet Camera (#6856) 
Changes the toggle helmet camera verb to a proc

Adds a check in the initialization of spacesuit helmets to see if it has a camera network.

Removes said check from the proc itself.

Basically this means you won't get the toggle-camera verb if you don't have one on your helmet.
 2020-03-17 15:47:46 -04:00
Unknown
ac2e5b8d03 Fixes Occupation Screen 2020-03-17 15:28:40 -04:00
Novacat
e19a1fd2b9 Merge pull request #6892 from VOREStation/upstream-merge-6819 
[MIRROR] Makes language keys case sensitive, adds unit tests for language conflicts, fixes some language conflicts
 2020-03-17 01:40:47 -04:00
Unknown
a0d1e784c7 More duplicates 2020-03-17 01:25:43 -04:00
Novacat
fb33bde693 Merge pull request #6896 from VOREStation/upstream-merge-6834 
[MIRROR] Fix various RIG issues
 2020-03-17 01:15:18 -04:00
Unknown
62e6874e9b Fixes duplicate language keys 2020-03-17 01:12:31 -04:00
Atermonera
cd10c54d5c Merge pull request #6834 from Mechoid/RIGFixes 
Fix various RIG issues
 2020-03-17 01:06:31 -04:00
Novacat
4891272f82 Update sound.dm 2020-03-17 01:03:31 -04:00
Novacat
d722e4fac0 Update miscellaneous.dm 2020-03-17 01:02:16 -04:00
Atermonera
101c9c33c5 QoL: Projectiles 2020-03-17 00:55:56 -04:00
Novacat
6ff1e6231b Merge pull request #6894 from VOREStation/upstream-merge-6825 
[MIRROR] Shock modification
 2020-03-17 00:50:00 -04:00
Novacat
a36d09d942 Update code/global_init.dm 
Co-Authored-By: Aronai Sieyes <arokha@arokha.com>
 2020-03-17 00:43:49 -04:00
Atermonera
66271e7a91 Merge pull request #6825 from Jamini/Jamini-patch-1 
Shock modification
 2020-03-17 00:38:07 -04:00
Novacat
6f65ffbf99 Update world.dm 2020-03-17 00:25:37 -04:00
Mechoid
487c39eab8 Antag Uplink Expansion 2020-03-17 00:23:20 -04:00
Atermonera
e3a67b3050 Makes language keys case sensitive, adds unit tests for language conflicts, fixes some language conflicts 2020-03-17 00:22:05 -04:00
Aronai Sieyes
13f181beda Merge pull request #6862 from VOREStation/vplk-zoomy-skybox 
Scale Skybox by client view size
 2020-03-16 10:01:50 -04:00
Novacat
db8bf886f8 Merge pull request #6884 from VOREStation/upstream-merge-6835 
[MIRROR] Optimize wire hacking QoL
 2020-03-16 09:58:50 -04:00
Novacat
d8d6cdc8f5 Merge pull request #6885 from VOREStation/upstream-merge-6838 
[MIRROR] Fix area/proc/gravitychange()
 2020-03-16 09:58:19 -04:00
Novacat
4043a0e424 Merge pull request #6886 from VOREStation/upstream-merge-6841 
[MIRROR] QoL: Safety Walk.
 2020-03-16 09:57:59 -04:00
Neerti
bedc880bf3 Fixes typo in halloss code. (#6842) 2020-03-16 05:58:48 -04:00
Neerti
78430f8152 Makes walk intent protect you from lagging into lava. (#6841) 2020-03-16 05:51:19 -04:00
Leshana
3e3241eeb2 Make area.gravitychange not require being passed a reference to... itself. (#6838) 2020-03-16 05:32:20 -04:00
Leshana
4c7ad1c24e Optimize wire hacking QoL (#6835) 
Keeps the same "bold if changed" functionality added in recent QoL improvements, but replaces the one-datum-instance per hint per device with a two number vars per device.
 2020-03-16 05:27:57 -04:00
Atermonera
f46c0ab673 Merge pull request #6828 from Schnayy/hairupdate 
Hair adjustments and additions
 2020-03-16 01:59:00 -04:00
Novacat
d86b64930e Merge pull request #6881 from Meghan-Rossi/mirrorfix 
Adds ckey whitelist check for mirrors
 2020-03-16 00:05:47 -04:00
Meghan-Rossi
c589388d08 Adds ckey whitelist check for mirrors 
Fixes https://github.com/VOREStation/VOREStation/issues/3882
 2020-03-16 02:24:33 +00:00
Leshana
9d517f469f Simplify skybox parallax code and add support for scaling for larger client.view sizes. 
- Hooked up skybox to recalculate it's scaling when the view changes.
 - Added constant defines to clarify where the magic numbers are coming from.
 2020-03-15 17:59:20 -04:00
Leshana
73c4809d26 Add proc set_viewsize() to allow hooking actions when client.view is changed. 
- Proc is on mob to simplify the standard use case; maybe someday actually save it there too if desired.
 2020-03-15 17:59:17 -04:00
Novacat
194c9f7a63 Merge pull request #6841 from VOREStation/upstream-merge-6818 
[MIRROR] Fully Implements R_EVENT for Event Managers
 2020-03-15 17:01:36 -04:00
Aronai Sieyes
836a47fb2d Missed a merge conflict marker 2020-03-15 15:24:05 -04:00
Aronai Sieyes
9bbfd211a3 Vorestation edit fixes 2020-03-15 15:17:27 -04:00
Novacat
8ca10f2be4 Merge pull request #6876 from VOREStation/upstream-merge-6823 
[MIRROR] Makes PDA beeps a toggable option.
 2020-03-15 15:14:52 -04:00
Novacat
176cf4f5ca Merge pull request #6874 from VOREStation/upstream-merge-6804 
[MIRROR] Big Bastard Incidental Sound Port
 2020-03-15 15:14:39 -04:00