cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,059 Commits 6 Branches 0 Tags
0151c0ad23b51a65bb3013d233d29026a022adc2
Commit Graph

66059 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rykka
0151c0ad23 Change Commonwealth References added by #2553 to Solgov 
https://github.com/CHOMPStation2/CHOMPStation2/pull/2553

Added Commonwealth voidsuits from Bay.

Changed these to Solgov to address https://github.com/CHOMPStation2/CHOMPStation2/issues/2598

<3
 2021-08-15 15:34:30 -07:00
Razgriz
56cf98728a Merge pull request #2805 from CHOMPStation2/cadyn-patch-1 
fix open bolt guns
 2021-08-15 03:05:11 -07:00
cadyn
0ab03cf119 fix open bolt guns 2021-08-15 02:55:41 -07:00
Razgriz
f5112a3246 Merge pull request #2802 from CHOMPStation2/Razgriz1032-patch-5 
Bandaid fix for inexplicably missing staff titles
 2021-08-14 22:35:40 -07:00
Razgriz
13c153bbda Bandaid fix for inexplicably missing staff titles 
I think we are having database issues, or it seems to not be wanting to read from admin_ranks.txt. This is a bandaid fix by adding the titles to the else statement. Other workaround is just to edit database manually.
 2021-08-14 22:22:46 -07:00
Nadyr
274538cf73 Merge pull request #2792 from CHOMPStationBot/upstream-merge-11399 
[MIRROR] Add proc to just reset database connections
 2021-08-15 01:05:28 -04:00
Nadyr
5369fa7b24 powder that makes you say yes 2021-08-15 00:36:12 -04:00
Nadyr
0cac8473de Merge pull request #2791 from CHOMPStationBot/upstream-merge-11398 
[MIRROR] Przy creations port from Chompers
 2021-08-15 00:35:23 -04:00
Nadyr
a89fef060e Merge pull request #2801 from CHOMPStation2/nanomaps_generation 
Automatic NanoMap Update
 2021-08-15 00:17:18 -04:00
Nadyr
b27a60f27a powder that makes you say yes 2021-08-15 00:12:31 -04:00
Nadyr
7ca928ccf9 powder that makes you say yes 2021-08-15 00:09:48 -04:00
Nadyr
da513e7001 powder that makes you say yes 2021-08-15 00:06:27 -04:00
Nadyr
991c52119b powder that makes you say yes 2021-08-15 00:04:38 -04:00
Nadyr
ae246a23b4 powder that makes you say yes 2021-08-15 00:02:47 -04:00
Nadyr
b420edf362 powder that makes you say yes 2021-08-15 00:01:29 -04:00
Nadyr
9b81b377c5 powder that makes you say yes 2021-08-14 22:14:08 -04:00
NanoMap Generation
8187b2cc15 NanoMap Auto-Update (Sun Aug 15 01:55:28 UTC 2021) 2021-08-15 01:55:28 +00:00
Nadyr
37f1681b46 Merge pull request #2800 from Kazzc/Un-Casino5.1 
Un-Casino 5.1 and fixes.
 2021-08-14 21:52:58 -04:00
Nadyr
47c017bbc0 Merge pull request #2785 from CHOMPStation2/BallisticsAgain 
Ballistics again
 2021-08-14 21:50:46 -04:00
Razgriz
049030f789 Merge pull request #2778 from CHOMPStation2/Razgriz1032-patch-1 
Change occupation selection color of pilot to be clearly listed as ex…
 2021-08-14 17:07:05 -07:00
Duriel Levara
6771d95557 Un-Casino 5.1 and fixes. 
*Southern Cross Floor 2 z-level
-Slapped blob spawner landmark on the Gym
*FrostFold outpost z-level
-Removed casino relay
-Decorated frost tiles
-Added plating under the cooling pipes by the Rust Engine.
-Fixed missing cables by the abandoned sec-post
*Exploration Carrier z-level
-Fixed some atmos edges
*Central Command z-level
-Fixed conveyor belts on Cargo's shuttle.
*Transit z-level
-Fixed spacing for all transit ships, they is now more space between them and thus more visually pleasing.
(report any bugs)
 2021-08-14 18:59:36 -04:00
Razgriz
ca5f0ca5c9 Update exploration_vr.dm 2021-08-14 04:39:08 -07:00
Nadyr
13956aa710 Merge pull request #2796 from Cyrelius/Cyrelius-patch-3 
Update sprite_accessories_taur_ch.dm
 2021-08-14 05:19:18 -04:00
Cyrelius
1ff2a500ba Update sprite_accessories_taur_ch.dm 
Added flavor text to naga alt tail that should have been there to begin with.
 2021-08-14 00:38:47 -07:00
Nadyr
7180f3d4c9 Merge pull request #2795 from CHOMPStationBot/upstream-merge-11383 
[MIRROR] Add default zorren tail to character setup menu
 2021-08-14 01:40:11 -04:00
Nadyr
e259e77ebe Merge pull request #2777 from User-U-U/medinerdsurgerytools 
Gives Medihound borg module surgery Tools
 2021-08-14 01:39:40 -04:00
Nadyr
72598b3bfe powder that makes you say yes 2021-08-13 23:53:46 -04:00
Nadyr
976457b6e8 Merge pull request #2793 from CHOMPStationBot/upstream-merge-11381 
[MIRROR] Tweak quad HUD icons alignment
 2021-08-13 23:48:05 -04:00
Nadyr
c8ff410f64 Merge pull request #2790 from CHOMPStationBot/upstream-merge-11396 
[MIRROR] Fix Salamanders and Wall-lockers
 2021-08-13 23:46:21 -04:00
Nadyr
ec7731c220 Merge pull request #2789 from CHOMPStationBot/upstream-merge-11391 
[MIRROR] Orange Line Upgrade
 2021-08-13 23:40:51 -04:00
Nadyr
5eed3f3616 Merge pull request #2788 from CHOMPStationBot/upstream-merge-11384 
[MIRROR] Virology Revamp
 2021-08-13 23:40:19 -04:00
Nadyr
23de9205e0 powder that makes you say yes 2021-08-13 23:16:33 -04:00
Nadyr
e9675a679e Merge pull request #2782 from CHOMPStation2/OvermapPOI 
Add fuel depot to overmap
 2021-08-13 23:13:27 -04:00
Nadyr
b758eaf0ba Merge pull request #2787 from CHOMPStationBot/upstream-merge-11392 
[MIRROR] Fancy Lifeboats
 2021-08-13 23:03:55 -04:00
Nadyr
417424985a Merge pull request #2786 from CHOMPStation2/Razgriz1032-patch-4 
Fix m41 magazine caliber
 2021-08-13 23:03:33 -04:00
Nadyr
56ca0ebd7e Merge pull request #2783 from CHOMPStation2/Razgriz1032-patch-2 
Removes broken YW bots.
 2021-08-13 23:01:09 -04:00
Nadyr
44e37d3c50 prefix fix 2021-08-13 22:59:37 -04:00
Chompstation Bot
17fbf219fc Add default zorren tail to character setup menu 2021-08-13 15:56:39 +00:00
Chompstation Bot
297c8909d3 Tweak quad HUD icons alignment 2021-08-13 15:44:18 +00:00
Aronai Sieyes
1ad84707c3 Merge pull request #11381 from VOREStation/Arokha/quadalign 
Tweak quad HUD icons alignment
 2021-08-13 15:44:18 +00:00
Chompstation Bot
49df49559d Add proc to just reset database connections 2021-08-13 15:41:09 +00:00
Chompstation Bot
b3d81048cb Przy creations port from Chompers 2021-08-13 15:41:03 +00:00
Chompstation Bot
f5212e0053 Fix Salamanders and Wall-lockers 2021-08-13 15:40:58 +00:00
Chompstation Bot
9a5b473b22 Orange Line Upgrade 2021-08-13 15:39:53 +00:00
Chompstation Bot
beef8e7f82 Virology Revamp 2021-08-13 15:38:46 +00:00
Chompstation Bot
cbd1953061 Fancy Lifeboats 2021-08-13 15:38:40 +00:00
Razgriz
be67e7a987 Merge pull request #2744 from CHOMPStationBot/upstream-merge-10786 
[MIRROR] Updates various sound files
 2021-08-13 02:25:13 -07:00
Razgriz
81712ba3be Merge pull request #2784 from CHOMPStation2/Razgriz1032-patch-3 
I used the shotgun
 2021-08-12 23:40:10 -07:00
Razgriz
d160a8528c Fix m41 magazine caliber 2021-08-12 22:30:31 -07:00
Razgriz
2ff1958668 More armor pen and buckshot damage 2021-08-12 22:20:36 -07:00