cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,285 Commits 8 Branches 0 Tags
c7a71bc5996fe35236c6910c1893aae66b1a2460
Commit Graph

66285 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raeschen
af51bb0667 ugh 2021-08-17 08:16:47 +02:00
Raeschen
d2147d77b3 Merge branch 'prbt' of https://github.com/Raeschen/CHOMPStation2 into prbt 2021-08-17 08:13:47 +02:00
Raeschen
6deb4e071c Revert "Merge branch 'master' into prbt" 
This reverts commit 6240ccc5fe, reversing
changes made to 2055234acf.
 2021-08-17 08:13:00 +02:00
Raeschen
d0b32346a6 Revert "Revert "Merge branch 'master' into prbt"" 
This reverts commit c7f19ecde1.
 2021-08-17 08:12:56 +02:00
Raeschen
cb879c31aa Revert "Fix conflict with master" 
This reverts commit 42eba2a9dc.
 2021-08-17 08:12:43 +02:00
Raeschen
9ef0a0b658 Delete audible_furry_vr.dm 2021-08-17 08:08:35 +02:00
Raeschen
42eba2a9dc Fix conflict with master 2021-08-17 08:01:06 +02:00
Raeschen
c7f19ecde1 Revert "Merge branch 'master' into prbt" 
This reverts commit 6240ccc5fe, reversing
changes made to 2055234acf.
 2021-08-17 07:54:00 +02:00
Raeschen
6240ccc5fe Merge branch 'master' into prbt 2021-08-17 07:50:06 +02:00
Raeschen
2055234acf Fix missing comments and commas 2021-08-17 07:47:55 +02:00
Nadyr
e33c4b842f Merge pull request #2814 from Verkister/squeks 
Adds squeaky toy noise as audible emote.
 2021-08-16 18:35:18 -04:00
TheGreatKitsune
872c886aea Add step mechanics when the target is lying down 2021-08-16 17:26:02 -05:00
Raeschen
826df0461a tweak scale/translation 2021-08-16 18:56:21 +02:00
Raeschen
07fd10026c Update shadekin.dm 2021-08-16 18:36:13 +02:00
Verkister
ba35cd5002 Adds squeaky toy noise as audible emote. 
*squeaky

Mirrorbot did another fucky wucky >:v
 2021-08-16 13:09:04 +03:00
Raeschen
b6ac8b4939 Adds *prbt 
Very important sound.
 2021-08-16 11:05:09 +02:00
Nadyr
e7d5ca8de7 Merge pull request #2803 from CHOMPStation2/Razgriz1032-patch-6 
Fix loading admin ranks if NOT using legacy system
 2021-08-15 23:50:11 -04:00
Nadyr
376d18632a Merge pull request #2811 from Rykka-Stormheart/shep-dev-solgov-suits 
Change Commonwealth References added by #2553 to Solgov
 2021-08-15 23:49:38 -04:00
Nadyr
ee98e93044 Merge pull request #2810 from Rykka-Stormheart/shep-dev-dupe-research-design-fix 
Fix Dupe Research Design
 2021-08-15 23:48:02 -04:00
Nadyr
6a0aeccf1c Merge pull request #2809 from Rykka-Stormheart/shep-dev-listening-post-mirror-fix 
Fix failed mirror in listeningpost.dm
 2021-08-15 23:47:36 -04:00
Nadyr
42290bafb9 Merge pull request #2807 from Verkister/patch-27 
Fixes a couple vorgan duping causes
 2021-08-15 23:47:01 -04:00
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
Rykka
80b7f0a089 Fix Dupe Research Design 
Ore Bag of Holding was fixed upstream, as it was a duplicate define, so this fixes the compile error of dupe research design and uses the upstream ore bag of holding.

Small bonus, the upstream is 1500 gold cheaper, 500 diamond cheaper, and only costs 2 BLUESPACE and 2 TECH materials. <3
 2021-08-15 15:15:24 -07:00
Rykka
083298643c Fix failed mirror in listeningpost.dm 
https://github.com/CHOMPStation2/CHOMPStation2/pull/1777

Mirror failed and left a HEAD/TAIL marking in listeningpost.dm

This fixes that. Niche, but it stalled out my compile on junglebase (And it will prevent stalling out if gateway is ever re-enabled). c:
 2021-08-15 15:07:23 -07:00
Verkister
61255c5e54 Fixes another vorgan duping condition 
If full_vorgans happen (vorepanel pref reload), slap that bellies_loaded var here so that a fresh vorepanel on relog knows shit's been loaded.
 2021-08-15 19:48:49 +03:00
Verkister
4f12590da6 Fixes vorgan duping caused by powerbottom voremobs 
Turns out voremobs were able to dupe other people's vorgans while trying to feed themselves to others by calling their own init on the pred instead. Made voremob nom init only fire if the mob is the pred.
 2021-08-15 17:38:10 +03: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
3d4bbc9bb4 Fix loading admin ranks if NOT using legacy system 
Error found by Cadyn. We're using a database to keep track of admins, so we are using the database system, but the database system does not load from the admin_ranks file, so no admin ranks are being loaded at all.

Decided to move it out of the legacy system if statement and just force it to load before deciding if its legacy or database.
 2021-08-14 22:39:53 -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