cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,536 Commits 8 Branches 0 Tags
4c7ad1c24e4d9fadec822b04532fba3dbe07914f
Commit Graph

24040 Commits

Author SHA1 Message Date
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
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
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
Novacat
4c7db1fc2d Update codex.dm 2020-03-15 14:45:18 -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
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
Novacat
8acc7c4d7b Merge pull request #6858 from VOREStation/aro-daaaark 
Fix shadekin infinite var not working
 2020-03-13 17:45:25 -04:00
Arokha Sieyes
fe6fe23bb7 Shadekin infinite dark energy fix 2020-03-13 17:34:58 -04:00
Atermonera
ecd37a0c71 Merge pull request #6781 from Mechoid/RailgunTweakening 
Tweak Station-Railguns
 2020-03-13 17:16:17 -04:00
Aronai Sieyes
6917c3ebf1 Missed a good place to check is_incorporeal 2020-03-13 15:27:10 -04:00
Aronai Sieyes
f3230d833c Merge pull request #6848 from VOREStation/aro-ship 
Updates smaller admin ship
 2020-03-13 11:01:38 -04:00
Schnayy
0185f541e3 Merge pull request #6821 from PrismaticGynoid/xenoarch_fix 
Xenoarch fix
 2020-03-13 10:47:13 -04:00
Aronai Sieyes
46bebeabac Make lighting correction only run on post-sslighting setup loads 2020-03-13 10:12:37 -04:00
Aronai Sieyes
0be3210ecd Fix adminload Z level lighting 2020-03-13 10:05:51 -04:00
Aronai Sieyes
a33ce421e8 Merge pull request #6836 from VOREStation/aro-sparky 
Add 'sparks' option when spawning characters
 2020-03-12 15:29:57 -04:00
Aronai Sieyes
921079908d Merge pull request #6839 from Meghan-Rossi/fluffstuff 
fluff items
 2020-03-12 15:21:34 -04:00
Atermonera
cb8548f5af Fully Implements R_EVENT for Event Managers 2020-03-12 15:01:50 -04:00
Arokha Sieyes
775ea3a958 Fix hook "failing" when no file 
It hasn't failed, really. And it prints another warning anyway.
 2020-03-12 14:12:17 -04:00
Arokha Sieyes
b6bf14727f Add 'sparks' option when spawning characters 2020-03-12 14:11:21 -04:00
Meghan-Rossi
f7eabadf22 fluff items 
*Adds Medal of Valor for Brynhild Vandradottir - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1688
*Adds Medal of Valor for Lilith Vespers - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1690
*Adds Vox scrap armor for Yikatihaki - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1662
*Adds silver pocket watch for Cappy Fuzzlyfeathers - approve in https://forum.vore-station.net/viewtopic.php?f=27&t=1651
*Adds green sweater vest for Zaku Fyodorovna - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1674
 2020-03-12 17:42:19 +00:00
Novacat
78e6fa891a Merge pull request #6833 from Novacat/nova-pathfinder 
Rigsuit Slot Updates
 2020-03-12 13:26:45 -04:00
Arokha Sieyes
e6f766d4c6 Rework resleeving sickness for voredeaths 2020-03-12 12:48:14 -04:00
Unknown
e8282b6232 Rigsuit Slot Updates 
- Adds Defibrilator compatibility to RIGsuits
- Allows the compact RIGsuit's suit storage to be compatible with belts and compact defibrilators
 2020-03-12 12:30:09 -04:00
Atermonera
223fb23423 Merge pull request #6811 from Schnayy/mwsprites 
Deluxe microwave sprites work
 2020-03-12 03:21:45 -04:00
Aronai Sieyes
371228344f Merge pull request #6828 from VOREStation/aro-paps 
Allow procs to spawn filled paper with passing info to constructor
 2020-03-12 00:38:45 -04:00
Leshana
48dd03d237 Make sure supply shuttle can dock even with codes 2020-03-11 23:57:49 -04:00
Aronai Sieyes
403dba2f60 Allow procs to spawn filled paper with passing info to constructor 2020-03-11 22:51:58 -04:00
Aronai Sieyes
c44f306724 Fix refueling into fuelports 
They still work from roundstart cus they have fuel in them. Just can't refuel without asking an admin to move a fuel tank into contents.
 2020-03-11 22:06:43 -04:00
Novacat
9b54f851b7 Merge pull request #6819 from VOREStation/upstream-merge-6810 
[MIRROR] QoL: Hacking
 2020-03-11 21:26:36 -04:00
Neerti
22954a5a04 QoL: Hacking (#6810) 
* Makes hacking window consider all hands instead of just the active one.

* Makes bottom indicators in hacking window go bold if they changed since the last refresh.

* Changelog
 2020-03-11 20:36:42 -04:00
Cerebulon
80f7f3afb2 Adds more machine button sounds (#6802) 
* Adds more machine button sounds

* chang
 2020-03-11 20:32:06 -04:00
Aronai Sieyes
28c9ff82fa Merge pull request #6808 from VOREStation/vplk-overmap 
Overmap Skybox, Ships, Sectors, and Boats
 2020-03-11 20:15:09 -04:00
Aronai Sieyes
d6583f4d30 Adds VChat tab saving 
Saves every time you enter/exit edit mode. Persists between rounds, VChat reloads via verb, etc.
 2020-03-11 19:27:14 -04:00
Novacat
ec219ac54d Merge pull request #6811 from VOREStation/upstream-merge-6725 
[MIRROR] Job description alt
 2020-03-11 18:59:08 -04:00
Aronai Sieyes
52f6286256 Our one special VR construct moves to mechfab, and remove dupes 2020-03-11 16:35:05 -04:00
Aronai Sieyes
8e784cc13a Move our VR stuff into 'specific' files 2020-03-11 16:34:45 -04:00
Atermonera
e45a95d365 Robotics Expansion: RIG-ged and Ready 2020-03-11 15:56:18 -04:00
Atermonera
fa8c9fabab Job description alt 2020-03-11 15:55:05 -04:00
Aronai Sieyes
465bce2dd4 Rebalance gas/ion thrusters 2020-03-11 11:11:43 -04:00