cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-27 18:42:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,364 Commits 7 Branches 0 Tags
d17efab021d1a7097f17d9c22a4fc47b81991ed5
Commit Graph

43168 Commits

Author SHA1 Message Date
Novacat
d17efab021 Merge pull request #9922 from Novacat/nova-basicfixes 
Fixes Ore deposits having icon error
 2021-03-12 01:59:10 +00:00
Nadyr
c6ceabf308 Merge pull request #1565 from CHOMPStationBot/upstream-merge-9900 
[MIRROR] [MIRROR] Fixes context-menu examine expanding incorrect target
 2021-03-11 00:53:51 -05:00
Nadyr
9be6ad7774 Merge pull request #1562 from CHOMPStationBot/upstream-merge-9897 
[MIRROR] [MIRROR] Tweaked implant loadout, refactored implant detection.
 2021-03-11 00:52:13 -05:00
Nadyr
8f92a8cfe0 Merge pull request #1560 from CHOMPStationBot/upstream-merge-9898 
[MIRROR] [MIRROR] Taking cell out of a standing drill now attempts to put it in your hands.
 2021-03-11 00:50:55 -05:00
Nadyr
75e18cc9b7 Merge pull request #1555 from CHOMPStationBot/upstream-merge-9889 
[MIRROR] [MIRROR] E-cigarette improvements
 2021-03-11 00:41:52 -05:00
Nadyr
1fa9bbb85c Merge pull request #1558 from CHOMPStationBot/upstream-merge-9895 
[MIRROR] Fixes Industrial Expansion
 2021-03-11 00:38:56 -05:00
Razgriz
93a023364e Merge pull request #1553 from kcin2001/fix-fitness 
fixes alt title filename so it actually loads over others and includes it
 2021-03-10 22:09:03 -07:00
Razgriz
a7c4693f3f Merge pull request #1544 from CHOMPStationBot/upstream-merge-9854 
[MIRROR] Makes drag-drop bodyjacking not break aghost bonds
 2021-03-10 22:08:15 -07:00
Novacat
6af8ca393b Merge pull request #9900 from VOREStation/upstream-merge-7958 
[MIRROR] Fixes context-menu examine expanding incorrect target
 2021-03-10 19:46:45 +00:00
Novacat
4631c4faca Merge pull request #9897 from VOREStation/upstream-merge-7963 
[MIRROR] Tweaked implant loadout, refactored implant detection.
 2021-03-10 19:40:33 +00:00
Novacat
24a9d22855 Merge pull request #9898 from VOREStation/upstream-merge-7964 
[MIRROR] Taking cell out of a standing drill now attempts to put it in your hands.
 2021-03-10 19:30:10 +00:00
Novacat
b6d583cbab Merge pull request #9895 from Novacat/nova-basicfixes 
Fixes Industrial Expansion
 2021-03-10 19:27:55 +00:00
Novacat
9098ecbda9 Merge pull request #9889 from VOREStation/upstream-merge-7949 
[MIRROR] E-cigarette improvements
 2021-03-10 19:07:18 +00:00
kcin2001
6b64faace0 fixes alt title filename so it actually loads over others and includes it 
also moves the other chompstation additions to the file because thats how i was told to add new job titles, if someone wants to fite me then fite me
 2021-03-10 03:11:08 -08: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
d94e59feea Merge pull request #1548 from CHOMPStationBot/upstream-merge-9871 
[MIRROR] [MIRROR] The Arcade Machine Update
 2021-03-10 01:48:25 -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
0131f176f1 Update frame.dm 2021-03-10 00:29:09 -05:00
Nadyr
76691e0cfc Update prisoner.dm 2021-03-10 00:18:57 -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
Nadyr
2daedbf83f Update job_controller.dm 2021-03-09 23:48:05 -05:00
Novacat
1c75b72b58 Merge pull request #9871 from VOREStation/upstream-merge-7938 
[MIRROR] The Arcade Machine Update
 2021-03-10 00:04:05 +00: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
Novacat
7de2e4ed3a Merge pull request #9854 from Verkister/patch-38 
Makes drag-drop bodyjacking not break aghost bonds
 2021-03-09 22:33:11 +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