cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,330 Commits 5 Branches 0 Tags
fad5c089588feebf45c8090d82760817eb722bb3
Commit Graph

28878 Commits

Author SHA1 Message Date
Chompstation Bot
fad5c08958 [MIRROR] Yet another clothing PR 2021-03-10 19:40:27 +00:00
Nadyr
9ba48ae869 Merge pull request #1538 from CHOMPStationBot/upstream-merge-9756 
[MIRROR] [MIRROR] R-UST rises again.
 2021-03-10 01:49:10 -05:00
Nadyr
9d19cb12e0 Merge pull request #1547 from CHOMPStationBot/upstream-merge-9870 
[MIRROR] [MIRROR] The Deep Scan Device
 2021-03-10 01:45:55 -05:00
Nadyr
da9dc5e71d Merge pull request #1542 from CHOMPStationBot/upstream-merge-9773 
[MIRROR] [MIRROR] Lobby Improvements
 2021-03-10 01:44:24 -05:00
Nadyr
d6cab496ed Merge pull request #1546 from CHOMPStationBot/upstream-merge-9867 
[MIRROR] [MIRROR] Added a GPS compass.
 2021-03-10 01:41:28 -05:00
Nadyr
e6d3089c18 Update fuel_compressor.dm 2021-03-10 01:13:09 -05:00
Chompstation Bot
2204cba6d8 [MIRROR] R-UST rises again. 2021-03-10 01:13:09 -05:00
Nadyr
dd5066a8e6 Merge pull request #1545 from CHOMPStationBot/upstream-merge-9815 
[MIRROR] [MIRROR] Removes transform from speech bubbles when speaker is scaled at less than 2x.
 2021-03-10 01:08:56 -05:00
Nadyr
604b71d59b Merge pull request #1539 from CHOMPStationBot/upstream-merge-9620 
[MIRROR] [MIRROR] Industrial Expansion
 2021-03-10 01:05:16 -05:00
Nadyr
e8fef935db Merge pull request #1541 from CHOMPStationBot/upstream-merge-9765 
[MIRROR] [MIRROR] Ports TGUI Security Stuff
 2021-03-10 00:57:50 -05:00
Nadyr
aba1d279aa Merge pull request #1534 from CHOMPStationBot/upstream-merge-9869 
[MIRROR] [MIRROR] Adds a modular armour version of the explorer suit and adds sprites to specialist armour
 2021-03-10 00:55:55 -05:00
Nadyr
d3dd243d72 Update mechfab_designs.dm 2021-03-10 00:54:22 -05:00
Nadyr
d04c4f7b73 Update weapons.dm 2021-03-10 00:51:39 -05:00
Nadyr
c4a5f1a238 Update power_cells.dm 2021-03-10 00:41:59 -05:00
Nadyr
3e60113ea0 Update mine_turfs.dm 2021-03-10 00:33:43 -05:00
Nadyr
33980cc6ca Merge pull request #1529 from CHOMPStationBot/upstream-merge-9883 
[MIRROR] Adds ability to set up and edit idle bellymode messages
 2021-03-10 00:16:00 -05:00
Nadyr
49fff7e97f Merge pull request #1532 from CHOMPStationBot/upstream-merge-9884 
[MIRROR] [MIRROR] Chirp chirp
 2021-03-10 00:09:09 -05:00
Nadyr
99ed4a1cc8 Merge pull request #1530 from CHOMPStationBot/upstream-merge-9882 
[MIRROR] [MIRROR] Adds some new wheelchair types
 2021-03-10 00:06:53 -05:00
Novacat
9478017c49 Merge pull request #9870 from VOREStation/upstream-merge-7937 
[MIRROR] The Deep Scan Device
 2021-03-10 00:02:58 +00:00
Novacat
1d0ca9dd1e Merge pull request #9867 from VOREStation/upstream-merge-7928 
[MIRROR] Added a GPS compass.
 2021-03-09 22:59:48 +00:00
Novacat
7c4508f6c3 Merge pull request #9815 from VOREStation/upstream-merge-7927 
[MIRROR] Removes transform from speech bubbles when speaker is scaled at less than 2x.
 2021-03-09 22:41:25 +00:00
Chompstation Bot
5a70c39b08 [MIRROR] Lobby Improvements 2021-03-09 22:32:57 +00:00
Sharkmare
ec1317ed1f Shadekin apply bugfix 
I somehow overlooked this when making my upstream PR, already made a fixed PR to them and adding it to here the same
 2021-03-09 23:22:39 +01:00
Chompstation Bot
1114327254 [MIRROR] Ports TGUI Security Stuff 2021-03-09 22:18:36 +00:00
Sharkmare
356493119f Somehow these changes were lost at first 2021-03-09 23:05:49 +01:00
Sharkmare
234bfbb791 Update hard override file and downports Vorestation changes of kin 
This updates our override file to no longer override the functions that are now just default handling
 2021-03-09 22:55:53 +01:00
Chompstation Bot
b85e9fc4d9 [MIRROR] Industrial Expansion 2021-03-09 21:53:03 +00:00
Chompstation Bot
598a7814e8 [MIRROR] Adds a modular armour version of the explorer suit and adds sprites to specialist armour 2021-03-09 20:17:06 +00:00
Novacat
10f0b040c8 Merge pull request #9884 from VOREStation/upstream-merge-7954 
[MIRROR] Chirp chirp
 2021-03-09 17:32:11 +00:00
Chompstation Bot
a459be5696 [MIRROR] Adds some new wheelchair types 2021-03-09 16:29:51 +00:00
Chompstation Bot
dbc080b0db Adds ability to set up and edit idle bellymode messages 2021-03-09 16:29:45 +00:00
Razgriz
4dafc3196e Add new ability, remove shifting text 2021-03-09 00:25:34 -07:00
Razgriz
abf01dba51 Merge pull request #1527 from kcin2001/paidrone 
adds construction drone sprite to pai chassis
 2021-03-08 22:24:11 -07:00
kcin2001
dc94d8177d adds construction drone sprite to pai chassis 
does what it says on the tin, no unique vore sprite just like the normal drone
 2021-03-08 20:49:17 -08:00
Nadyr
61d14c5ace Merge pull request #1522 from CHOMPStationBot/upstream-merge-9876 
[MIRROR] [MIRROR] Fixed/generalized loadout implants.
 2021-03-08 23:32:43 -05:00
Novacat
955be2e5fe Merge pull request #9876 from VOREStation/upstream-merge-7953 
[MIRROR] Fixed/generalized loadout implants.
 2021-03-08 16:53:20 +00:00
Novacat
ebf0391948 Merge pull request #9865 from Heroman3003/sizespace-suit 
Adds HYPER suit
 2021-03-08 16:06:23 +00:00
Nadyr
be75595852 Merge pull request #1514 from CHOMPStationBot/upstream-merge-9858 
[MIRROR] [MIRROR] Stair tweaks
 2021-03-07 23:41:18 -05:00
Nadyr
a60540a9e6 Merge pull request #1512 from CHOMPStationBot/upstream-merge-9862 
[MIRROR] Restricts some size-mechanics with prefs
 2021-03-07 22:23:08 -05:00
Nadyr
81c2f9dac9 Merge pull request #1510 from Holdelta/MiningAdditions 
Mining additions
 2021-03-07 22:09:06 -05:00
Nadyr
d2077d8abf Merge pull request #1516 from CHOMPStationBot/upstream-merge-9873 
[MIRROR] [MIRROR] Diet/Allergy Rework & Refactor Pt2
 2021-03-07 21:56:32 -05:00
Nadyr
2beb66357e Merge pull request #1515 from CHOMPStationBot/upstream-merge-9874 
[MIRROR] [MIRROR] Fix stacking machine not stacking most materials
 2021-03-07 21:48:02 -05:00
Nadyr
c4f0585fc6 Update vorepanel_vr.dm 2021-03-07 21:14:41 -05:00
Nadyr
73b50bcc9d Update vore_vr.dm 2021-03-07 21:12:58 -05:00
Nadyr
8944bca569 Update living_vr.dm 2021-03-07 21:08:28 -05:00
Novacat
efd4408d5b Merge pull request #9873 from VOREStation/upstream-merge-7940 
[MIRROR] Diet/Allergy Rework & Refactor Pt2
 2021-03-07 22:01:53 +00:00
Novacat
0109cb82c3 Merge pull request #9874 from VOREStation/upstream-merge-7948 
[MIRROR] Fix stacking machine not stacking most materials
 2021-03-07 21:48:35 +00:00
Chompstation Bot
58eaa09d29 [MIRROR] Stair tweaks 2021-03-07 17:52:48 +00:00
Chompstation Bot
eb91e59b72 Restricts some size-mechanics with prefs 2021-03-07 17:33:18 +00:00
Novacat
82aaf56264 Merge pull request #9866 from KillianKirilenko/kk-tweaks 
ERT Adds: 🌺🐦👥
 2021-03-07 14:38:32 +00:00