cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-26 10:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,579 Commits 9 Branches 0 Tags
ac2e5b8d03dd76b839fb853db440b5bf45efa105
Commit Graph

36481 Commits

Author SHA1 Message Date
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
Novacat
bede486326 Merge pull request #6875 from VOREStation/upstream-merge-6816 
[MIRROR] [Bugfix/Oversight] Response Team Channel Shortcut
 2020-03-15 14:52:08 -04:00
Atermonera
b2becc99b5 Merge pull request #6823 from lbnesquik/KoK-PDA-tweak 
Makes PDA beeps a toggable option.
 2020-03-15 14:48:00 -04:00
Novacat
33d8c118b7 Update firstaid.dm 2020-03-15 14:46:16 -04:00
Novacat
4c7db1fc2d Update codex.dm 2020-03-15 14:45:18 -04:00
Novacat
8e2e4c6a4a Update sound.dm 2020-03-15 14:44:33 -04:00
Novacat
92775a573a Update vending.dm 2020-03-15 14:43:33 -04:00
Novacat
972deeae2d Update announce.dm 2020-03-15 14:42:57 -04:00
Atermonera
3da8fbe37d Merge pull request #6816 from TheFurryFeline/TFF-Response_Team_Comms_Channel_Key 
[Bugfix/Oversight] Response Team Channel Shortcut
 2020-03-15 14:41:36 -04:00
Novacat
557ed2e43e Update occupation.dm 2020-03-15 14:40:44 -04:00
Atermonera
8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
Atermonera
3ac5a32e39 Fixes the occupation screen. 2020-03-15 14:35:59 -04:00
Aronai Sieyes
2edaeea49a Merge pull request #6870 from VOREStation/aro-exportfix 
Fix chat exporting when someone has used unicode
 2020-03-15 14:20:05 -04:00
Arokha Sieyes
f9b732f94a Fix chat exporting when someone has used unicode 
Only affects clients still using 512
 2020-03-15 00:06:49 -04:00
Meghan-Rossi
6b51eecab2 Timeclock fixes 
Fixes https://github.com/VOREStation/VOREStation/issues/6863
Also makes timeclock display all departments a job is in and which it earns/requires PTO for
 2020-03-15 01:27:58 +00:00
Aronai Sieyes
474a8c6b61 Further tweak to shuttle corner turf appearances 
Removes some weirdness.
 2020-03-14 17:38:04 -04:00
Novacat
17f48e0e75 Merge pull request #6856 from VOREStation/upstream-merge-6785 
[MIRROR] Prosthetic Expansion: Advent of Species
 2020-03-14 14:24:40 -04:00
Aronai Sieyes
91d4e6897a Prosthetic Expansion: Advent of Species 
Update robolimbs.dm
Update vorestation.dme
Update prosfab_designs.dm
Fix prosfab_designs.dm
 2020-03-14 14:04:06 -04:00